[Pkg-voip-commits] [linphone] 05/07: Import Debian patch 3.6.1-2.4

[Bernhard Schmidt]

This is an automated email from the git hooks/post-receive script.

berni pushed a commit to branch jessie
in repository linphone.

commit a089992217ff6017927b5eb2940ab4e3fffdb79b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 16 11:01:47 2014 -0400

    Import Debian patch 3.6.1-2.4
---
 debian/changelog             |  7 +++++++
 debian/patches/libav11.patch | 12 ++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2dd69db..4eb148f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linphone (3.6.1-2.4) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add libav11.patch fix compilation against libav11 (Closes: #758017)
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sat, 16 Aug 2014 11:01:47 -0400
+
 linphone (3.6.1-2.3) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/libav11.patch b/debian/patches/libav11.patch
new file mode 100644
index 0000000..cef7d11
--- /dev/null
+++ b/debian/patches/libav11.patch
@@ -0,0 +1,12 @@
+--- a/mediastreamer2/src/utils/ffmpeg-priv.h
++++ b/mediastreamer2/src/utils/ffmpeg-priv.h
+@@ -69,9 +69,6 @@ static inline int avcodec_decode_video2(
+ 	return avcodec_decode_video(avctx,picture, got_picture_ptr,avpkt->data,avpkt->size);
+ }
+ #endif
+-#if (LIBAVCODEC_VERSION_MAJOR >= 56)
+-#include <libavcodec/old_codec_ids.h>
+-#endif
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
+ #define CodecID AVCodecID
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 5ce97aa..5a38ef5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ libav9.patch
 #add-zrtp-to-ortp-dependencies.patch
 #kfreebsd.patch
 libav10.patch
+libav11.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/linphone.git