[SCM] ffms2/master: Add upstream patch to fix compilation with libav

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 900a566bb848629f42626cafd6da4b2cb9e4bfe2
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Dec 2 20:37:53 2013 +0100

    Add upstream patch to fix compilation with libav

diff --git a/debian/patches/fix-compilation-libav.patch b/debian/patches/fix-compilation-libav.patch
new file mode 100644
index 0000000..20bf9d5
--- /dev/null
+++ b/debian/patches/fix-compilation-libav.patch
@@ -0,0 +1,25 @@
+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 63c767a..7529846 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 symbol-visibility.patch
+fix-compilation-libav.patch

-- 
ffms2 packaging