[SCM] ffms2/master: Drop patch, no longer needed

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Tue Jul 1 00:44:09 UTC 2014


The following commit has been merged in the master branch:
commit 02a1e57e2785027c66816256f6d59f8f42d6fa66
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Jul 1 02:18:39 2014 +0200

    Drop patch, no longer needed

diff --git a/debian/patches/fix-compilation-libav.patch b/debian/patches/fix-compilation-libav.patch
deleted file mode 100644
index 20bf9d5..0000000
--- a/debian/patches/fix-compilation-libav.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix compilation with libav
-Origin: upstream,
- https://github.com/FFMS/ffms2/commit/1999d95fef838b61685d30215ccc6afa887b6fa7
-Last-Update: 2013-12-02
-
-diff --git a/src/core/audiosource.cpp b/src/core/audiosource.cpp
-index 615f57a..97ec70c 100644
---- a/src/core/audiosource.cpp
-+++ b/src/core/audiosource.cpp
-@@ -23,6 +23,12 @@
- #include <algorithm>
- #include <cassert>
- 
-+extern "C" {
-+#if VERSION_CHECK(LIBAVUTIL_VERSION_INT, >=, 52, 2, 0, 52, 6, 100)
-+#include <libavutil/channel_layout.h>
-+#endif
-+}
-+
- namespace {
- #define MAPPER(m, n) OptionMapper<FFMS_ResampleOptions>(n, &FFMS_ResampleOptions::m)
- OptionMapper<FFMS_ResampleOptions> resample_options[] = {
--- 
-1.8.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 7529846..63c767a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 symbol-visibility.patch
-fix-compilation-libav.patch

-- 
ffms2 packaging



More information about the pkg-multimedia-commits mailing list