[SCM] lives/master: Fix compilation with libav 9
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Tue Aug 27 16:13:50 UTC 2013
The following commit has been merged in the master branch:
commit b02a6eed71b494816f94aa8ceb3bb135e1be07c2
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Tue Aug 27 18:06:51 2013 +0200
Fix compilation with libav 9
diff --git a/debian/patches/03-libav9.patch b/debian/patches/03-libav9.patch
new file mode 100644
index 0000000..f12e016
--- /dev/null
+++ b/debian/patches/03-libav9.patch
@@ -0,0 +1,16 @@
+Description: Fix compilation with libav 9
+Author: Sebastian Ramacher <sramacher at debian.org>
+Bug-Debian: http://bugs.debian.org/720805
+Last-Update: 2013-08-27
+
+--- lives-2.0.5~ds0.orig/lives-plugins/plugins/decoders/mpegts_decoder.c
++++ lives-2.0.5~ds0/lives-plugins/plugins/decoders/mpegts_decoder.c
+@@ -69,7 +69,7 @@ const char *plugin_version="LiVES mpegts
+ # define offsetof(T, F) ((unsigned int)((char *)&((T *)0)->F))
+ #endif
+
+-#ifndef AV_OPT_TYPE_INT
++#if LIBAVUTIL_VERSION_MAJOR < 52 && !defined(AV_OPT_TYPE_INT)
+ #define AV_OPT_TYPE_INT FF_OPT_TYPE_INT
+ #endif
+
diff --git a/debian/patches/series b/debian/patches/series
index 28e26b8..627617d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01-cdda2wav_to_icedax.patch
02-drop_py3_multiencoder.patch
+03-libav9.patch
--
lives packaging
More information about the pkg-multimedia-commits
mailing list