[SCM] lives/master: Another workaround for libav10
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Tue May 13 11:31:36 UTC 2014
The following commit has been merged in the master branch:
commit b0aed5bf6591fcc4841cb820112cc8161ad8f1af
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Tue May 13 13:29:27 2014 +0200
Another workaround for libav10
diff --git a/debian/patches/03-libav10.patch b/debian/patches/03-libav10.patch
new file mode 100644
index 0000000..1096518
--- /dev/null
+++ b/debian/patches/03-libav10.patch
@@ -0,0 +1,168 @@
+Description: Fix build with libav 10
+ CODEC_ID_SNOW got removed and some other compat defines are missing. Also,
+ av_close_input_file and av_codec_set_pkt_timebase do not exist.
+Author: Sebastian Ramacher <sramacher at debian.org>
+Last-Update: 2014-05-12
+
+--- a/libweed/weed-compat.h
++++ b/libweed/weed-compat.h
+@@ -260,7 +260,6 @@
+ #define CODEC_ID_TRUEMOTION2 AV_CODEC_ID_TRUEMOTION2
+ #define CODEC_ID_MSZH AV_CODEC_ID_MSZH
+ #define CODEC_ID_ZLIB AV_CODEC_ID_ZLIB
+-#define CODEC_ID_SNOW AV_CODEC_ID_SNOW
+ #define CODEC_ID_4XM AV_CODEC_ID_4XM
+ #define CODEC_ID_FLV1 AV_CODEC_ID_FLV1
+ #define CODEC_ID_FLASHSV AV_CODEC_ID_FLASHSV
+@@ -294,14 +293,14 @@
+ #define CODEC_ID_FLASHSV2 AV_CODEC_ID_FLASHSV2
+ #define CODEC_ID_TEXT AV_CODEC_ID_TEXT
+ #define CODEC_ID_SSA AV_CODEC_ID_SSA
+-#define CODEC_ID_SSA AV_CODEC_ID_SRT
++#define CODEC_ID_SRT AV_CODEC_ID_SRT
+ #define CODEC_ID_VP8 AV_CODEC_ID_VP8
+ #define CODEC_ID_RV10 AV_CODEC_ID_RV10
+ #define CODEC_ID_RV20 AV_CODEC_ID_RV20
+ #define CODEC_ID_RV30 AV_CODEC_ID_RV30
+ #define CODEC_ID_RV40 AV_CODEC_ID_RV40
+ #define CODEC_ID_MP3 AV_CODEC_ID_MP3
+-#define CODEC_ID_MP3 AV_CODEC_ID_MP2
++#define CODEC_ID_MP2 AV_CODEC_ID_MP2
+ #define CODEC_ID_AAC AV_CODEC_ID_AAC
+ #define CODEC_ID_PCM_BLURAY AV_CODEC_ID_PCM_BLURAY
+ #define CODEC_ID_AC3 AV_CODEC_ID_AC3
+@@ -339,7 +338,7 @@
+
+ #define CODEC_ID_PCM_U8 AV_CODEC_ID_PCM_U8
+
+-#define CODEC_ID_PCM_QDM2 AV_CODEC_ID_QDM2
++#define CODEC_ID_QDM2 AV_CODEC_ID_QDM2
+ #define CODEC_ID_RA_144 AV_CODEC_ID_RA_144
+ #define CODEC_ID_RA_288 AV_CODEC_ID_RA_288
+ #define CODEC_ID_ATRAC3 AV_CODEC_ID_ATRAC3
+@@ -350,6 +349,20 @@
+
+ #define CODEC_ID_TTF AV_CODEC_ID_TTF
+
++#define CODEC_ID_R10K AV_CODEC_ID_R10K
++#define CODEC_ID_R210 AV_CODEC_ID_R210
++#define CODEC_ID_V210 AV_CODEC_ID_V210
++#define CODEC_ID_MJPEGB AV_CODEC_ID_MJPEGB
++#define CODEC_ID_SVQ3 AV_CODEC_ID_SVQ3
++#define CODEC_ID_8BPS AV_CODEC_ID_8BPS
++#define CODEC_ID_SMC AV_CODEC_ID_SMC
++#define CODEC_ID_QTRLE AV_CODEC_ID_QTRLE
++#define CODEC_ID_QDRAW AV_CODEC_ID_QDRAW
++#define CODEC_ID_DNXHD AV_CODEC_ID_DNXHD
++#define CODEC_ID_SGI AV_CODEC_ID_SGI
++#define CODEC_ID_DPX AV_CODEC_ID_DPX
++#define CODEC_ID_PRORES AV_CODEC_ID_PRORES
++
+ #endif
+
+ const AVCodecTag codec_bmp_tags[] = {
+@@ -526,7 +539,6 @@
+ { CODEC_ID_TRUEMOTION1, MKTAG('P', 'V', 'E', 'Z') },
+ { CODEC_ID_MSZH, MKTAG('M', 'S', 'Z', 'H') },
+ { CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') },
+- { CODEC_ID_SNOW, MKTAG('S', 'N', 'O', 'W') },
+ { CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') },
+ { CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') },
+ { CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') },
+--- a/lives-plugins/plugins/decoders/libav_helper.h
++++ b/lives-plugins/plugins/decoders/libav_helper.h
+@@ -60,6 +60,7 @@
+ #define CODEC_ID_VP3 AV_CODEC_ID_VP3
+ #define CODEC_ID_VP5 AV_CODEC_ID_VP5
+ #define CODEC_ID_VP6 AV_CODEC_ID_VP6
++#define CODEC_ID_VP6A AV_CODEC_ID_VP6A
+ #define CODEC_ID_VP6F AV_CODEC_ID_VP6F
+ #define CODEC_ID_ASV1 AV_CODEC_ID_ASV1
+ #define CODEC_ID_ASV2 AV_CODEC_ID_ASV2
+@@ -74,7 +75,6 @@
+ #define CODEC_ID_TRUEMOTION2 AV_CODEC_ID_TRUEMOTION2
+ #define CODEC_ID_MSZH AV_CODEC_ID_MSZH
+ #define CODEC_ID_ZLIB AV_CODEC_ID_ZLIB
+-#define CODEC_ID_SNOW AV_CODEC_ID_SNOW
+ #define CODEC_ID_4XM AV_CODEC_ID_4XM
+ #define CODEC_ID_FLV1 AV_CODEC_ID_FLV1
+ #define CODEC_ID_FLASHSV AV_CODEC_ID_FLASHSV
+@@ -108,7 +108,7 @@
+ #define CODEC_ID_FLASHSV2 AV_CODEC_ID_FLASHSV2
+ #define CODEC_ID_TEXT AV_CODEC_ID_TEXT
+ #define CODEC_ID_SSA AV_CODEC_ID_SSA
+-#define CODEC_ID_SSA AV_CODEC_ID_SRT
++#define CODEC_ID_SRT AV_CODEC_ID_SRT
+ #define CODEC_ID_VP8 AV_CODEC_ID_VP8
+ #define CODEC_ID_RV10 AV_CODEC_ID_RV10
+ #define CODEC_ID_RV20 AV_CODEC_ID_RV20
+@@ -153,7 +153,7 @@
+
+ #define CODEC_ID_PCM_U8 AV_CODEC_ID_PCM_U8
+
+-#define CODEC_ID_PCM_QDM2 AV_CODEC_ID_QDM2
++#define CODEC_ID_QDM2 AV_CODEC_ID_QDM2
+ #define CODEC_ID_RA_144 AV_CODEC_ID_RA_144
+ #define CODEC_ID_RA_288 AV_CODEC_ID_RA_288
+ #define CODEC_ID_ATRAC3 AV_CODEC_ID_ATRAC3
+@@ -164,6 +164,20 @@
+
+ #define CODEC_ID_TTF AV_CODEC_ID_TTF
+
++#define CODEC_ID_R10K AV_CODEC_ID_R10K
++#define CODEC_ID_R210 AV_CODEC_ID_R210
++#define CODEC_ID_V210 AV_CODEC_ID_V210
++#define CODEC_ID_MJPEGB AV_CODEC_ID_MJPEGB
++#define CODEC_ID_SVQ3 AV_CODEC_ID_SVQ3
++#define CODEC_ID_8BPS AV_CODEC_ID_8BPS
++#define CODEC_ID_SMC AV_CODEC_ID_SMC
++#define CODEC_ID_QTRLE AV_CODEC_ID_QTRLE
++#define CODEC_ID_QDRAW AV_CODEC_ID_QDRAW
++#define CODEC_ID_DNXHD AV_CODEC_ID_DNXHD
++#define CODEC_ID_SGI AV_CODEC_ID_SGI
++#define CODEC_ID_DPX AV_CODEC_ID_DPX
++#define CODEC_ID_PRORES AV_CODEC_ID_PRORES
++
+ #endif
+
+ #if ((LIBAVUTIL_VERSION_MAJOR < 51) || (LIBAVUTIL_VERSION_MAJOR == 51) && (LIBAVUTIL_VERSION_MINOR < 22))
+@@ -212,7 +226,7 @@
+ return;
+ }
+ s->time_base = new_tb;
+- av_codec_set_pkt_timebase(s->codec, new_tb);
++ s->codec->time_base = new_tb;
+ s->pts_wrap_bits = pts_wrap_bits;
+ }
+
+--- a/lives-plugins/plugins/decoders/mkv_decoder.c
++++ b/lives-plugins/plugins/decoders/mkv_decoder.c
+@@ -1610,7 +1610,6 @@
+ switch (priv->vidst->codec->codec_id) {
+ case CODEC_ID_VP8 : sprintf(cdata->video_name,"%s","vp8"); break;
+ case CODEC_ID_THEORA : sprintf(cdata->video_name,"%s","theora"); break;
+- case CODEC_ID_SNOW : sprintf(cdata->video_name,"%s","snow"); break;
+ case CODEC_ID_DIRAC : sprintf(cdata->video_name,"%s","dirac"); break;
+ case CODEC_ID_MJPEG : sprintf(cdata->video_name,"%s","mjpeg"); break;
+ case CODEC_ID_MPEG1VIDEO : sprintf(cdata->video_name,"%s","mpeg1"); break;
+--- a/lives-plugins/plugins/decoders/mkv_decoder.h
++++ b/lives-plugins/plugins/decoders/mkv_decoder.h
+@@ -334,7 +334,6 @@
+ {"V_REAL/RV20" , CODEC_ID_RV20},
+ {"V_REAL/RV30" , CODEC_ID_RV30},
+ {"V_REAL/RV40" , CODEC_ID_RV40},
+- {"V_SNOW" , CODEC_ID_SNOW},
+ {"V_THEORA" , CODEC_ID_THEORA},
+ {"V_UNCOMPRESSED" , CODEC_ID_RAWVIDEO},
+ {"V_VP8" , CODEC_ID_VP8},
+--- a/lives-plugins/plugins/decoders/avformat_decoder.c
++++ b/lives-plugins/plugins/decoders/avformat_decoder.c
+@@ -673,7 +673,7 @@
+ close(priv->fd);
+
+ // will close and free the context
+- if (priv->ic !=NULL) av_close_input_file(priv->ic);
++ if (priv->ic !=NULL) avformat_close_input(&priv->ic);
+
+ if (cdata->palettes!=NULL) free(cdata->palettes);
+ cdata->palettes=NULL;
diff --git a/debian/patches/series b/debian/patches/series
index 28e26b8..4b273e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01-cdda2wav_to_icedax.patch
02-drop_py3_multiencoder.patch
+03-libav10.patch
--
lives packaging
More information about the pkg-multimedia-commits
mailing list