[SCM] ffms2/master: unbreak compilation against libav 0.8

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8c75d15abeecdb3e20501af777aaabd3353c966a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Nov 7 21:31:13 2012 +0100

    unbreak compilation against libav 0.8

diff --git a/debian/patches/series b/debian/patches/series
index 63c767a..dfe5bf3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 symbol-visibility.patch
+unbreak-fbtfs-0.8.patch
diff --git a/debian/patches/unbreak-fbtfs-0.8.patch b/debian/patches/unbreak-fbtfs-0.8.patch
new file mode 100644
index 0000000..9a3392f
--- /dev/null
+++ b/debian/patches/unbreak-fbtfs-0.8.patch
@@ -0,0 +1,26 @@
+Author: Reinhard Tartler <siretart at tauware.de>
+Description: Unbreak compilation against Libav 0.8
+Forwarded-Upstream: not-needed
+
+--- a/src/core/codectype.cpp
++++ b/src/core/codectype.cpp
+@@ -96,7 +96,7 @@ typedef struct AVCodecTag {
+ 	unsigned int tag;
+ } AVCodecTag;
+ 
+-#if VERSION_CHECK(LIBAVFORMAT_VERSION_INT, <, 54, 1, 0, 53, 32, 100)
++#if 0
+ static const AVCodecTag codec_bmp_tags[] = {
+ 	{ CODEC_ID_H264,         MKTAG('H', '2', '6', '4') },
+ 	{ 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
+ 		// 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;
++		AVCodec *codec = CodecContext->codec;
+ 		avcodec_close(CodecContext);
+ 		avcodec_open2(CodecContext, codec, 0);
+ 	}

-- 
ffms2 packaging