[SCM] gmerlin-avdecoder/master: Fix FTBFS with libav 9

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b69b236f940225589608763d6a6066ea611ed42e
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Nov 17 12:50:27 2012 +0000

    Fix FTBFS with libav 9
    
    Closes: #693502
    LP: #1079993

diff --git a/debian/patches/fix-ftbfs-libav9.patch b/debian/patches/fix-ftbfs-libav9.patch
new file mode 100644
index 0000000..05f4a5a
--- /dev/null
+++ b/debian/patches/fix-ftbfs-libav9.patch
@@ -0,0 +1,41 @@
+Description: Fix FTBFS against libav 9
+   * Unbreak compilation against libav 9
+Author: Reinhard Tartler <siretart at tauware.de>
+
+---
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: no
+
+Index: gmerlin-avdecoder-1.2.0~dfsg/lib/demux_ffmpeg.c
+===================================================================
+--- gmerlin-avdecoder-1.2.0~dfsg.orig/lib/demux_ffmpeg.c	2012-11-17 07:26:54.000000000 +0000
++++ gmerlin-avdecoder-1.2.0~dfsg/lib/demux_ffmpeg.c	2012-11-17 07:26:54.000000000 +0000
+@@ -296,8 +296,10 @@
+     { CODEC_ID_MACE3, BGAV_MK_FOURCC('M', 'A', 'C', '3') },
+     { CODEC_ID_MACE6, BGAV_MK_FOURCC('M', 'A', 'C', '6') },
+     { CODEC_ID_VMDAUDIO, BGAV_MK_FOURCC('V', 'M', 'D', 'A')},
++#if LIBAVCODEC_VERSION_MAJOR == 53
+     { CODEC_ID_SONIC, BGAV_WAVID_2_FOURCC(0x2048) },
+     //    { CODEC_ID_SONIC_LS, },
++#endif
+     //    { CODEC_ID_FLAC, },
+     { CODEC_ID_MP3ADU, BGAV_MK_FOURCC('r', 'm', 'p', '3') },
+     { CODEC_ID_MP3ON4, BGAV_MK_FOURCC('m', '4', 'a', 29) },
+Index: gmerlin-avdecoder-1.2.0~dfsg/lib/audio_ffmpeg.c
+===================================================================
+--- gmerlin-avdecoder-1.2.0~dfsg.orig/lib/audio_ffmpeg.c	2012-11-17 07:29:36.478270559 +0000
++++ gmerlin-avdecoder-1.2.0~dfsg/lib/audio_ffmpeg.c	2012-11-17 07:30:47.176321476 +0000
+@@ -773,10 +773,12 @@
+       CODEC_ID_VMDAUDIO,
+       (uint32_t[]){ BGAV_MK_FOURCC('V', 'M', 'D', 'A'),
+                     0x00 } },
++#if LIBAVCODEC_VERSION_MAJOR == 53
+     /*     CODEC_ID_SONIC, */
+     { "FFmpeg Sonic decoder", "Sonic", CODEC_ID_SONIC,
+       (uint32_t[]){ BGAV_WAVID_2_FOURCC(0x2048), 0x00 },
+       -1 },
++#endif
+     
+     /*     CODEC_ID_SONIC_LS, */
+     /*     CODEC_ID_FLAC, */
diff --git a/debian/patches/series b/debian/patches/series
index 09e8a7d..0963d0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ autoconf_removed_sources.patch
 system_gsm.patch
 gmerlin_versioned_depends.patch
 fix_typos.patch
+fix-ftbfs-libav9.patch

-- 
gmerlin-avdecoder packaging