Hi
On 2014-04-23 10:06:37, Alessio Treglia wrote:
Hi there,
On Wed, Apr 23, 2014 at 2:12 AM, Reinhard Tartler siret...@gmail.com wrote:
Refresh patches, drop libav10.patch as it was adopted upstream.
I believe that there is nothing left to do, right?
I forwarded the patch to Gabriel and it looks he's found a cleaner way
the achieve the same.
Cheers!
Looks like this wasn't enough since the binNMUs to rebuild lives against
libav 10 failed. I got it to build with the attached patch. I'll prepare
an upload later tonight.
Cheers
--
Sebastian Ramacher
Description: Drop snow codec
It got removed from libav 10
Author: Sebastian Ramacher sramac...@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
