From 05142eaf138693fdf0c7687d56fc1180ea0eaad7 Mon Sep 17 00:00:00 2001
From: Heshan Wanigasooriya <heshanmw@gmail.com>
Date: Mon, 1 Jun 2009 01:31:07 +0000
Subject: #474194 by sajalsoni:"This video is currently being processed. Please
 wait." fixed. #477478 by  JohnnyHa:No video starts playing fixed.

---
 plugins/video_ffmpeg_helper/video_ffmpeg_helper.install | 1 +
 plugins/video_ffmpeg_helper/video_ffmpeg_helper.module  | 1 -
 plugins/video_ffmpeg_helper/video_render.php            | 1 +
 plugins/video_ffmpeg_helper/video_scheduler.php         | 2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'plugins/video_ffmpeg_helper')

diff --git a/plugins/video_ffmpeg_helper/video_ffmpeg_helper.install b/plugins/video_ffmpeg_helper/video_ffmpeg_helper.install
index 9b40ab6..aa76914 100644
--- a/plugins/video_ffmpeg_helper/video_ffmpeg_helper.install
+++ b/plugins/video_ffmpeg_helper/video_ffmpeg_helper.install
@@ -72,6 +72,7 @@ function video_ffmpeg_helper_schema() {
   return $schema;
 }
 
+
 /**
  * Implementation of hook_install().
  */
diff --git a/plugins/video_ffmpeg_helper/video_ffmpeg_helper.module b/plugins/video_ffmpeg_helper/video_ffmpeg_helper.module
index 2d0ee1f..45e82d3 100644
--- a/plugins/video_ffmpeg_helper/video_ffmpeg_helper.module
+++ b/plugins/video_ffmpeg_helper/video_ffmpeg_helper.module
@@ -360,7 +360,6 @@ function _video_ffmpeg_helper_get_video_info(&$node, $value=null) {
     return $ffmpeg_info[$fileobj->filename];
   }
   
-
   // escape file name for safety
   $file = escapeshellarg($fileobj->filepath);
   // create the full command to execute
diff --git a/plugins/video_ffmpeg_helper/video_render.php b/plugins/video_ffmpeg_helper/video_render.php
index 675861f..2d8e0ec 100644
--- a/plugins/video_ffmpeg_helper/video_render.php
+++ b/plugins/video_ffmpeg_helper/video_render.php
@@ -54,6 +54,7 @@ if (isset($_SERVER['argv'][3])) {
 
 include_once('./includes/bootstrap.inc');
 //module_load_include('/includes/bootstrap.inc', 'video_render', 'includes/bootstrap');
+//
 // disable error reporting for bootstrap process
 error_reporting(E_ERROR);
 // let's bootstrap: we will be able to use drupal apis
diff --git a/plugins/video_ffmpeg_helper/video_scheduler.php b/plugins/video_ffmpeg_helper/video_scheduler.php
index 58c9e7b..8c2d6ce 100644
--- a/plugins/video_ffmpeg_helper/video_scheduler.php
+++ b/plugins/video_ffmpeg_helper/video_scheduler.php
@@ -80,7 +80,7 @@ function video_scheduler_main() {
     }
   }
   else {
-    watchdog('video_scheduler', 'no video conversion jobs to schedule.');
+    watchdog('video_scheduler', 'no video conversion jobs to schedule.', array(), WATCHDOG_DEBUG);
   }
 }
 
-- 
cgit v1.2.3