From c2132e3e04247ef8d39540161be895a9ceec63fd Mon Sep 17 00:00:00 2001
From: Heshan <heshan@heidisoft.com>
Date: Thu, 17 Mar 2011 12:41:33 +0530
Subject: Adding node publish only conversion is completed.

---
 transcoders/video_ffmpeg.inc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'transcoders')

diff --git a/transcoders/video_ffmpeg.inc b/transcoders/video_ffmpeg.inc
index 33e5067..54d6413 100644
--- a/transcoders/video_ffmpeg.inc
+++ b/transcoders/video_ffmpeg.inc
@@ -30,6 +30,7 @@ class video_ffmpeg implements transcoder_interface {
   }
 
   public function run_command($command) {
+    // transcoder switching
     $command = strtr($command, array(
           '!ffmpeg' => $this->params['ffmpeg'],
           '!ffmpeg2theora' => $this->params['ffmpeg2theora'],
@@ -39,11 +40,11 @@ class video_ffmpeg implements transcoder_interface {
         ));
     $command = $this->nice . $command . '  2>&1';
     watchdog('transcoder', 'Executing command: ' . $command, array(), WATCHDOG_DEBUG);
-    ob_start();
-    passthru($command, $command_return);
-    $output = ob_get_contents();
-    ob_end_clean();
-    return $output;
+//    ob_start();
+    $command_return = shell_exec($command);
+//    $output = ob_get_contents();
+//    ob_end_clean();
+    return $command_return;
   }
 
   public function generate_thumbnails($video) {
@@ -302,7 +303,7 @@ class video_ffmpeg implements transcoder_interface {
       '#type' => 'textfield',
       '#title' => t('Mcoder'),
       '#description' => t('Absolute path to Mcoder executable. This will provide a token of !macoder to preset commands.'),
-      '#default_value' => variable_get('video_macoder_path', '/usr/bin/macoder'),
+      '#default_value' => variable_get('video_macoder_path', '/usr/bin/mcoder'),
     );
     $form['transcoders']['video_handbreke_path'] = array(
       '#type' => 'textfield',
-- 
cgit v1.2.3