diff options
Diffstat (limited to 'transcoders')
| -rw-r--r-- | transcoders/video_ffmpeg.inc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/transcoders/video_ffmpeg.inc b/transcoders/video_ffmpeg.inc index 98108de..224ea1f 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) { @@ -326,7 +327,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', |