Index: ffmpeg_wrapper.module
===================================================================
--- ffmpeg_wrapper.module	(revision 1249)
+++ ffmpeg_wrapper.module	(working copy)
@@ -70,6 +70,21 @@ function ffmpeg_wrapper_admin() {
     '#description' => t('Absolute path to the FFmpeg exeutable. Leave blank if you do not need this.'),
   );
 
+  // add some integration with ffmpeg_converter to make it a little easier for people to convert files
+  if (module_exists('ffmpeg_converter')) {
+    $form['ffmpeg_converter_wrapper'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('FFmpeg Converter'),
+    );
+    $form['ffmpeg_converter_wrapper']['ffmpeg_converter_wrapper_default_preset'] = array(
+      '#type' => 'select',
+      '#title' => t('Default preset for converting files'),
+      '#default_value' => variable_get('ffmpeg_converter_wrapper_default_preset'),
+      '#options' => ffmpeg_converter_presets(),
+      '#description' => t('When converting files from the node edit page, which preset to use by default.')
+    );
+  }
+
   // Configuration information
   // Get the FFmpeg information
   $ffmpeg = new ffmpeg_wrapper();
@@ -620,6 +635,7 @@ function ffmpeg_wrapper_convert_file($pa
   }
   // Run the command
   $ffmpeg->command(implode(" ", $options));
+  $ffmpeg->params = '<pre>' . var_export($params, true) . '</pre>';
   return $ffmpeg;
 }