[SCM] transcode/master: Remove "-vpre medium" from ffmpeg's arguments list to avoid crashes as the "medium" preset doesn't exist.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6ae176be727ced6ecb669a973bfe407690d28731
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Aug 27 13:34:27 2012 +0200

    Remove "-vpre medium" from ffmpeg's arguments list to avoid crashes as the "medium" preset doesn't exist.
    
    Closes: #681436
    Thanks: Fabian Greffrath for the patch.

diff --git a/debian/patches/04_ffmpeg_options.patch b/debian/patches/04_ffmpeg_options.patch
new file mode 100644
index 0000000..d0429b1
--- /dev/null
+++ b/debian/patches/04_ffmpeg_options.patch
@@ -0,0 +1,26 @@
+Description: Remove "-vpre medium" from ffmpeg's command-line arguments list.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681436
+From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681436#25
+---
+ export/ffmpeg_cfg.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- transcode.orig/export/ffmpeg_cfg.c
++++ transcode/export/ffmpeg_cfg.c
+@@ -126,7 +126,7 @@ int lavc_param_gmc = 0;
+ //int lavc_param_atag = 0;
+ //int lavc_param_abitrate = 224;
+ 
+-char *lavc_param_video_preset = "medium";
++char *lavc_param_video_preset = NULL;
+ char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg";
+ 
+ TCConfigEntry lavcopts_conf[]={
+@@ -237,7 +237,6 @@ TCConfigEntry lavcopts_conf[]={
+     {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
+     {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
+     {"fps_code", &lavc_param_fps_code, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9},
+-    {"vpre", &lavc_param_video_preset, TCCONF_TYPE_STRING, 0, 0, 0},
+     {"ffmpeg_datadir", &lavc_param_ffmpeg_datadir, TCCONF_TYPE_STRING, 0, 0, 0},
+     {NULL, NULL, 0, 0, 0, 0}
+ };
diff --git a/debian/patches/series b/debian/patches/series
index db2171b..1e940f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_filter_pv.c.diff
 03_libav-api-fixes.diff
+04_ffmpeg_options.patch

-- 
transcode packaging