# 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)
@@ -1110,6 +1110,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');