[SCM] gmerlin-avdecoder/master: Update patch header.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Nov 17 12:54:34 UTC 2012


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

    Update patch header.
    
    Git-Dch: Ignore

diff --git a/debian/patches/fix-ftbfs-libav9.patch b/debian/patches/fix-ftbfs-libav9.patch
index 05f4a5a..ee9c468 100644
--- a/debian/patches/fix-ftbfs-libav9.patch
+++ b/debian/patches/fix-ftbfs-libav9.patch
@@ -1,17 +1,17 @@
 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
+Forwarded: plaum at ipf.uni-stuttgart.de
+---
+ lib/audio_ffmpeg.c |    2 ++
+ lib/demux_ffmpeg.c |    2 ++
+ 2 files changed, 4 insertions(+)
 
-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 @@
+--- gmerlin-avdecoder.orig/lib/demux_ffmpeg.c
++++ gmerlin-avdecoder/lib/demux_ffmpeg.c
+@@ -296,8 +296,10 @@ static audio_codec_map_t audio_codecs[]
      { 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')},
@@ -22,11 +22,9 @@ Index: gmerlin-avdecoder-1.2.0~dfsg/lib/demux_ffmpeg.c
      //    { 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 @@
+--- gmerlin-avdecoder.orig/lib/audio_ffmpeg.c
++++ gmerlin-avdecoder/lib/audio_ffmpeg.c
+@@ -773,10 +773,12 @@ static codec_info_t codec_infos[] =
        CODEC_ID_VMDAUDIO,
        (uint32_t[]){ BGAV_MK_FOURCC('V', 'M', 'D', 'A'),
                      0x00 } },

-- 
gmerlin-avdecoder packaging



More information about the pkg-multimedia-commits mailing list