[SCM] idjc/master: Add patch for build issues with libav 9/10

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Tue Feb 18 17:43:16 UTC 2014


The following commit has been merged in the master branch:
commit ec0973987689b0c800ce19e40d821227fa57c0fc
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Feb 18 17:58:09 2014 +0100

    Add patch for build issues with libav 9/10
    
    Closes: #739320

diff --git a/debian/patches/libav.patch b/debian/patches/libav.patch
new file mode 100644
index 0000000..ea75609
--- /dev/null
+++ b/debian/patches/libav.patch
@@ -0,0 +1,36 @@
+Description: Fix building with libav 9 and 10
+Author: Sebastian Ramacher <sramacher at debian.org>
+Last-Update: 2014-02-18
+
+--- a/c/avcodecdecode.c
++++ b/c/avcodecdecode.c
+@@ -25,6 +25,7 @@
+ #include <stdlib.h>
+ #include <pthread.h>
+ #include <libavutil/opt.h>
++#include <libavutil/channel_layout.h>
+ #include "main.h"
+ #include "xlplayer.h"
+ #include "avcodecdecode.h"
+@@ -80,8 +81,8 @@
+         av_seek_frame(self->ic, -1, (int64_t)xlplayer->seek_s * AV_TIME_BASE, 0);
+         switch (self->c->codec_id)
+             {
+-            case CODEC_ID_MUSEPACK7:   /* add formats here that glitch when seeked */
+-            case CODEC_ID_MUSEPACK8:
++            case AV_CODEC_ID_MUSEPACK7:   /* add formats here that glitch when seeked */
++            case AV_CODEC_ID_MUSEPACK8:
+                 self->drop = 1.6;
+                 fprintf(stderr, "dropping %0.2f seconds of audio\n", self->drop);
+             default:
+--- a/c/avcodec_encoder.c
++++ b/c/avcodec_encoder.c
+@@ -283,7 +283,7 @@
+         if ((codec = avcodec_find_encoder_by_name(*name)))
+             return codec;
+ 
+-    return avcodec_find_encoder(CODEC_ID_AAC);
++    return avcodec_find_encoder(AV_CODEC_ID_AAC);
+ }
+ 
+ static AVCodec *aacplus_codec()

-- 
idjc packaging



More information about the pkg-multimedia-commits mailing list