[SCM] lives/master: Add patch to prevent FTBFS with libav.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Oct 22 23:23:03 UTC 2011


The following commit has been merged in the master branch:
commit 95e7f8bbd270a9dd3b4f00ea784e39343b2d8431
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Oct 23 01:22:52 2011 +0200

    Add patch to prevent FTBFS with libav.

diff --git a/debian/patches/03-libav.patch b/debian/patches/03-libav.patch
new file mode 100644
index 0000000..a7b1596
--- /dev/null
+++ b/debian/patches/03-libav.patch
@@ -0,0 +1,18 @@
+Description: Prevent FTBFS with libav.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ lives-plugins/plugins/decoders/asf_decoder.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- lives.orig/lives-plugins/plugins/decoders/asf_decoder.c
++++ lives/lives-plugins/plugins/decoders/asf_decoder.c
+@@ -1227,7 +1227,7 @@ static boolean attach_stream(lives_clip_
+ 	snprintf(cdata->audio_name,16,"unknown");
+ 
+       } else if (type == LIVES_MEDIA_TYPE_VIDEO) {
+-	priv->st->codec->codec_type = CODEC_TYPE_VIDEO;
++	priv->st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ 	if (vidindex!=-1&&vidindex!=priv->st->id) {
+ 	  fprintf(stderr, "asf_decoder: unhandled multiple vidstreams %d and %d in %s\n",vidindex,priv->st->id,cdata->URI);
+ 	  got_vidst=TRUE;
diff --git a/debian/patches/series b/debian/patches/series
index 28e26b8..9532dca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
+03-libav.patch

-- 
lives packaging



More information about the pkg-multimedia-commits mailing list