[SCM] ffdiaporama/master: Adapt preset option to libav 0.9

[fabricesp-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f40d69d99e97f0732c4831eb606494bbbbc53252
Author: Fabrice Coutadeur <coutadeurf at gmail.com>
Date:   Mon Feb 11 05:51:25 2013 +0100

    Adapt preset option to libav 0.9

diff --git a/debian/patches/libav_0.9.patch b/debian/patches/libav_0.9.patch
new file mode 100644
index 0000000..cd2fbb7
--- /dev/null
+++ b/debian/patches/libav_0.9.patch
@@ -0,0 +1,43 @@
+--- a/src/ffDiaporama/DlgRenderVideo/DlgRenderVideo.cpp
++++ b/src/ffDiaporama/DlgRenderVideo/DlgRenderVideo.cpp
+@@ -688,7 +688,7 @@
+             Preset="-fpre \""+Preset+"libx264-hq.ffpreset\"";
+             #endif
+             #ifdef LIBAV_08
+-            if (isAVCONV)   Preset="-preset veryfast -refs:0 3";
++            if (isAVCONV)   Preset="-pre \""+Preset+"libx264-hq.ffpreset\"";
+                 else        Preset="-preset veryfast -x264opts ref=3";
+             #endif
+         } else if (VIDEOCODECDEF[VideoCodecIndex].FFD_VCODEC==VCODEC_H264PQ) {
+@@ -696,7 +696,7 @@
+             Preset="-fpre \""+Preset+"libx264-pq.ffpreset\"";
+             #endif
+             #ifdef LIBAV_08
+-            if (isAVCONV)   Preset="-preset veryfast -profile:v baseline -tune:v fastdecode";
++            if (isAVCONV)   Preset="-pre \""+Preset+"libx264-pq.ffpreset\"";
+                 else        Preset="-preset veryfast -x264opts ref=3 -profile:v baseline -tune:v fastdecode";
+             #endif
+         } else if (VIDEOCODECDEF[VideoCodecIndex].FFD_VCODEC==VCODEC_X264LL) {
+@@ -704,7 +704,8 @@
+             Preset="-fpre \""+Preset+"libx264-lossless.ffpreset\"";
+             #endif
+             #ifdef LIBAV_08
+-            Preset="-preset veryfast -qp 0 ";
++            if (isAVCONV)   Preset="-pre \""+Preset+"libx264-lossless.ffpreset\"";
++                else        Preset="-preset veryfast -qp 0 ";
+             #endif
+         }
+         vCodec=vCodec+" "+Preset;
+@@ -769,7 +770,11 @@
+             AudioChannels=1;
+             AudioFrequency=8000;
+         }
+-        if (QString(AUDIOCODECDEF[AudioCodecIndex].ShortName)==QString("aac"))          aCodec=aCodec+" -strict experimental -absf aac_adtstoasc";
++        if (QString(AUDIOCODECDEF[AudioCodecIndex].ShortName)==QString("aac"))
++            if (isAVCONV) 
++	    aCodec=aCodec+" -strict experimental -bsf:a aac_adtstoasc";
++	    else
++	    aCodec=aCodec+" -strict experimental -absf aac_adtstoasc";
+         if (AudioFrequency!=48000)                                                      aCodec=aCodec+QString(" -ar %1").arg(AudioFrequency);
+         if (AudioChannels !=2)                                                          aCodec=aCodec+QString(" -ac %1").arg(AudioChannels);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3acc3d9..131f376 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_hardening_flags.patch
+libav_0.9.patch

-- 
ffdiaporama packaging