From 22ea3cf474ec42cf6272fb14a8916240295cff1a Mon Sep 17 00:00:00 2001
From: Heshan <heshan@heidisoft.com>
Date: Tue, 15 Mar 2011 20:08:28 +0530
Subject: Conversion of the videos are in and tested with mp4 and webm presets

---
 includes/preset.inc | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'includes/preset.inc')

diff --git a/includes/preset.inc b/includes/preset.inc
index c2870a5..7709392 100644
--- a/includes/preset.inc
+++ b/includes/preset.inc
@@ -39,7 +39,12 @@ class video_preset {
       $preset[$value['name']] = $value['name'] . ' ' . l(t('edit'), ('admin/config/media/video/presets/preset/' . $value['name']));
 //      $help[] = $value['name'] . ' - ' . $value['description'] . ' ' . l(t('edit'), preset_get_preset_path('video', $value['name']));
     }
-
+    $form['video_use_preset_wxh'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Use preset WxH for video conversion.'),
+      '#default_value' => variable_get('video_use_preset_wxh', FALSE),
+      '#description' => t('Override the user selected WxH with the preset values. This is recommend.')
+    );
     $form['video_preset'] = array(
       '#type' => 'checkboxes',
       '#title' => t('Video transcode presets'),
@@ -67,7 +72,9 @@ class video_preset {
     $presets = array();
     $preset = $this->preset;
     foreach ($preset as $preset_name) {
-      $presets[$preset_name] = video_get_preset($preset_name);
+      // skip selecting disabled presets 0=>0
+      if (!empty($preset_name))
+        $presets[$preset_name] = video_get_preset($preset_name);
     }
     return $presets;
   }
-- 
cgit v1.2.3