commit fa9ce65c3cdd198456730d4320b0e927237a432f
Author: Ryan Hughes <rjhughes@drawesome.localdomain>
Date:   Sat Aug 22 09:39:27 2009 -0400

    Make video_ffmpeg_helper work with postgres.

diff --git a/sites/all/modules/video/plugins/video_ffmpeg_helper/video_render.php b/sites/all/modules/video/plugins/video_ffmpeg_helper/video_render.php
index cad54d9..17ee96c 100644
--- a/sites/all/modules/video/plugins/video_ffmpeg_helper/video_render.php
+++ b/sites/all/modules/video/plugins/video_ffmpeg_helper/video_render.php
@@ -132,7 +132,12 @@ function video_render_main() {
       //$file->fid = db_next_id('{files}_fid');
       //print_r($file);
       //GMM: fixed added timestamp column for completeness (otherwise 0), D6 FILE_STATUS
-      db_query("INSERT INTO {files} (fid, uid, filename, filepath, filemime, filesize, status, timestamp) VALUES (%d, %d, '%s', '%s', '%s', %d, %d, %d)", $file->fid, $job->uid, $file->filename, $file->filepath, $file->filemime, $file->filesize, FILE_STATUS_PERMANENT, time());
+
+      if (!$file->fid) {
+        db_query("INSERT INTO {files} (uid, filename, filepath, filemime, filesize, status, timestamp) VALUES (%d, '%s', '%s', '%s', %d, %d, %d)", $job->uid, $file->filename, $file->filepath, $file->filemime, $file->filesize, FILE_STATUS_PERMANENT, time());
+      } else {
+        db_query("INSERT INTO {files} (fid, uid, filename, filepath, filemime, filesize, status, timestamp) VALUES (%d, %d, '%s', '%s', '%s', %d, %d, %d)", $file->fid, $job->uid, $file->filename, $file->filepath, $file->filemime, $file->filesize, FILE_STATUS_PERMANENT, time());
+      }
       
       // to know other modules of fid
       $file->fid = db_last_insert_id('files', 'fid');
diff --git a/sites/all/modules/video/plugins/video_ffmpeg_helper/video_scheduler.php b/sites/all/modules/video/plugins/video_ffmpeg_helper/video_scheduler.php
index f21e942..66a57b4 100644
--- a/sites/all/modules/video/plugins/video_ffmpeg_helper/video_scheduler.php
+++ b/sites/all/modules/video/plugins/video_ffmpeg_helper/video_scheduler.php
@@ -100,7 +100,8 @@ function video_scheduler_select() {
   // TODO: use db_query_range
   $jobs = array();
   $i = 0;
-  $count = db_result(db_query('SELECT COUNT(*) FROM {video_rendering} vr INNER JOIN {node} n ON vr.vid = n.vid INNER JOIN {video} v ON n.vid = v.vid WHERE n.nid = v.nid AND vr.nid = n.nid AND vr.status = %d ORDER BY n.created', VIDEO_RENDERING_PENDING));
+  $count = db_result(db_query('SELECT COUNT(*) FROM {video_rendering} vr INNER JOIN {node} n ON vr.vid = n.vid INNER JOIN {video} v ON n.vid = v.vid WHERE n.nid = v.nid AND vr.nid = n.nid AND vr.status = %d', VIDEO_RENDERING_PENDING));
+
   while($i < $count && $i < VIDEO_RENDERING_FFMPEG_INSTANCES) {
     $jobs[] = db_fetch_object($result);
     $i++;