[SCM] ffms2/master: Drop d/p/unbreak-ftbfs-0.8.patch
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Mon Dec 2 21:43:03 UTC 2013
The following commit has been merged in the master branch:
commit 04d215baebcb8e52b778bbea0beae9c5095eff55
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Mon Dec 2 20:23:31 2013 +0100
Drop d/p/unbreak-ftbfs-0.8.patch
Patch is no longer needed
diff --git a/debian/patches/series b/debian/patches/series
index dfe5bf3..63c767a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
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
deleted file mode 100644
index d264725..0000000
--- a/debian/patches/unbreak-fbtfs-0.8.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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,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