[SCM] lives/master: Drop 03-libav.patch, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Dec 3 13:30:39 UTC 2011


The following commit has been merged in the master branch:
commit df0b72ef36b86a2ffb53c0f59a8728828374da32
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Dec 3 14:30:31 2011 +0100

    Drop 03-libav.patch, applied upstream.

diff --git a/debian/patches/03-libav.patch b/debian/patches/03-libav.patch
deleted file mode 100644
index a7b1596..0000000
--- a/debian/patches/03-libav.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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 9532dca..28e26b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
-03-libav.patch

-- 
lives packaging



More information about the pkg-multimedia-commits mailing list