# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
Index: modules/ffmpeg_wrapper/ffmpeg_wrapper.module
--- modules/ffmpeg_wrapper/ffmpeg_wrapper.module Base (1.1.2.20.2.38)
+++ modules/ffmpeg_wrapper/ffmpeg_wrapper.module Locally Modified (Based On 1.1.2.20.2.38)
@@ -263,6 +263,9 @@
   // Escape our command, but make sure that we allow | and ;
   $ffmpeg_object->command = str_replace($pattern, $replace, escapeshellcmd($path .' '. $command));
 
+  // log command
+  watchdog('ffmpeg_wrapper', t('executing : !command', array('!command' => $ffmpeg_object->command)) );
+
   $ffmpeg_object->cwd = getcwd();
 
   // does binary exist?
@@ -727,7 +730,8 @@
  * @return array
  */
 function ffmpeg_wrapper_file_data($path = null) {
-  if (file_exists($path)) {
+  if (! file_exists($path))
+    return false;
     // get duration from ffmpeg
     // need quotes around the path parameter in case filename has spaces.
     $output = ffmpeg_wrapper_run_command("-i \"$path\"");
@@ -795,8 +799,8 @@
       $file['video']['br'] = 'na';
     }
     return $file;
+
   }
-}
 
 
 /**
@@ -1110,6 +1114,11 @@
  */
 function ffmpeg_wrapper_configuration_form($configuration = array(), $form_prefix = '' ) {
 
+  // if no any specific values pass in then use $conf
+  if(empty($configuration)){
+    global $conf;
+    $configuration = $conf;
+  }
\ No newline at end of file
   // enable the javascript configuration options on the output type to use AJAX
   // to update the allowed values
   ffmpeg_wrapper_enable_js($form_prefix, 'ffmpeg_output_type');