[SCM] ffms2/master: do not break compilation against libav9

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Fri Nov 9 14:36:45 UTC 2012


The following commit has been merged in the master branch:
commit c43b9be8909e2225c60edea80b7ffad17b63e888
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 9 15:35:05 2012 +0100

    do not break compilation against libav9

diff --git a/debian/patches/unbreak-fbtfs-0.8.patch b/debian/patches/unbreak-fbtfs-0.8.patch
index 9a3392f..d264725 100644
--- a/debian/patches/unbreak-fbtfs-0.8.patch
+++ b/debian/patches/unbreak-fbtfs-0.8.patch
@@ -15,11 +15,14 @@ Forwarded-Upstream: not-needed
  	{ CODEC_ID_H264,         MKTAG('h', '2', '6', '4') },
 --- a/src/core/utils.cpp
 +++ b/src/core/utils.cpp
-@@ -566,7 +566,7 @@ void FlushBuffers(AVCodecContext *CodecC
+@@ -566,7 +566,10 @@ void FlushBuffers(AVCodecContext *CodecC
  		// If the codec doesn't have flush(), it might not need it... or it
  		// might need it and just not implement it as in the case of VC-1, so
  		// close and reopen the codec
 -		const AVCodec *codec = CodecContext->codec;
++#if (LIBAVCODEC_VERSION_INT) >= (AV_VERSION_INT(54, 0, 0))
++		const
++#endif
 +		AVCodec *codec = CodecContext->codec;
  		avcodec_close(CodecContext);
  		avcodec_open2(CodecContext, codec, 0);

-- 
ffms2 packaging



More information about the pkg-multimedia-commits mailing list