[SCM] lives/master: Fix compilation against libav10
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Apr 5 02:46:55 UTC 2014
The following commit has been merged in the master branch:
commit 11011e9698897264960dee5f4974181069effcd0
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Apr 4 22:31:46 2014 -0400
Fix compilation against libav10
diff --git a/debian/control b/debian/control
index 2d34c45..52e163a 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
libaa1-dev,
libasound2-dev [linux-any],
libavc1394-dev [linux-any],
- libavformat-dev,
+ libavformat-dev (>= 6:10~),
libdirac-dev[!m68k],
libdirectfb-dev[!hurd-i386],
libdv4-dev[!hurd-i386],
@@ -33,7 +33,7 @@ Build-Depends:
libpulse-dev,
libraw1394-dev [linux-any],
libsdl1.2-dev,
- libswscale-dev,
+ libswscale-dev (>= 6:10~),
libtheora-dev[!sparc64],
libtool,
libunicap2-dev [linux-any],
diff --git a/debian/patches/libav10.patch b/debian/patches/libav10.patch
new file mode 100644
index 0000000..0ccbd30
--- /dev/null
+++ b/debian/patches/libav10.patch
@@ -0,0 +1,1173 @@
+Description: Fix compilation against Libav10
+Author: Reinhard Tartler <siretart at tauware.de>
+Bug-Debian: http://bugs.debian.org/739327
+
+--- lives-2.2.2~ds0.orig/libweed/weed-compat.h
++++ lives-2.2.2~ds0/libweed/weed-compat.h
+@@ -214,216 +214,216 @@ typedef struct AVCodecTag {
+ #endif
+
+ const AVCodecTag codec_bmp_tags[] = {
+- { CODEC_ID_H264, MKTAG('H', '2', '6', '4') },
+- { CODEC_ID_H264, MKTAG('h', '2', '6', '4') },
+- { CODEC_ID_H264, MKTAG('X', '2', '6', '4') },
+- { CODEC_ID_H264, MKTAG('x', '2', '6', '4') },
+- { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') },
+- { CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') },
+- { CODEC_ID_H263, MKTAG('H', '2', '6', '3') },
+- { CODEC_ID_H263, MKTAG('X', '2', '6', '3') },
+- { CODEC_ID_H263, MKTAG('T', '2', '6', '3') },
+- { CODEC_ID_H263, MKTAG('L', '2', '6', '3') },
+- { CODEC_ID_H263, MKTAG('V', 'X', '1', 'K') },
+- { CODEC_ID_H263, MKTAG('Z', 'y', 'G', 'o') },
+- { CODEC_ID_H263P, MKTAG('H', '2', '6', '3') },
+- { CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */
+- { CODEC_ID_H261, MKTAG('H', '2', '6', '1') },
+- { CODEC_ID_H263P, MKTAG('U', '2', '6', '3') },
+- { CODEC_ID_H263P, MKTAG('v', 'i', 'v', '1') },
+- { CODEC_ID_MPEG4, MKTAG('F', 'M', 'P', '4') },
+- { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') },
+- { CODEC_ID_MPEG4, MKTAG('D', 'X', '5', '0') },
+- { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') },
+- { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') },
+- { CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') },
+- { CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 0 ) }, /* some broken avi use this */
+- { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') },
+- { CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') },
+- { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
+- { CODEC_ID_MPEG4, MKTAG('U', 'M', 'P', '4') },
+- { CODEC_ID_MPEG4, MKTAG('W', 'V', '1', 'F') },
+- { CODEC_ID_MPEG4, MKTAG('S', 'E', 'D', 'G') },
+- { CODEC_ID_MPEG4, MKTAG('R', 'M', 'P', '4') },
+- { CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') },
+- { CODEC_ID_MPEG4, MKTAG('F', 'F', 'D', 'S') },
+- { CODEC_ID_MPEG4, MKTAG('F', 'V', 'F', 'W') },
+- { CODEC_ID_MPEG4, MKTAG('D', 'C', 'O', 'D') },
+- { CODEC_ID_MPEG4, MKTAG('M', 'V', 'X', 'M') },
+- { CODEC_ID_MPEG4, MKTAG('P', 'M', '4', 'V') },
+- { CODEC_ID_MPEG4, MKTAG('S', 'M', 'P', '4') },
+- { CODEC_ID_MPEG4, MKTAG('D', 'X', 'G', 'M') },
+- { CODEC_ID_MPEG4, MKTAG('V', 'I', 'D', 'M') },
+- { CODEC_ID_MPEG4, MKTAG('M', '4', 'T', '3') },
+- { CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'X') },
+- { CODEC_ID_MPEG4, MKTAG('H', 'D', 'X', '4') }, /* flipped video */
+- { CODEC_ID_MPEG4, MKTAG('D', 'M', 'K', '2') },
+- { CODEC_ID_MPEG4, MKTAG('D', 'I', 'G', 'I') },
+- { CODEC_ID_MPEG4, MKTAG('I', 'N', 'M', 'C') },
+- { CODEC_ID_MPEG4, MKTAG('E', 'P', 'H', 'V') }, /* Ephv MPEG-4 */
+- { CODEC_ID_MPEG4, MKTAG('E', 'M', '4', 'A') },
+- { CODEC_ID_MPEG4, MKTAG('M', '4', 'C', 'C') }, /* Divio MPEG-4 */
+- { CODEC_ID_MPEG4, MKTAG('S', 'N', '4', '0') },
+- { CODEC_ID_MPEG4, MKTAG('V', 'S', 'P', 'X') },
+- { CODEC_ID_MPEG4, MKTAG('U', 'L', 'D', 'X') },
+- { CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'V') },
+- { CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */
+- { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */
+- { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
+- { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') },
+- { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '5') },
+- { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '6') },
+- { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '4') },
+- { CODEC_ID_MSMPEG4V3, MKTAG('D', 'V', 'X', '3') },
+- { CODEC_ID_MSMPEG4V3, MKTAG('A', 'P', '4', '1') },
+- { CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '1') },
+- { CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '0') },
+- { CODEC_ID_MSMPEG4V2, MKTAG('M', 'P', '4', '2') },
+- { CODEC_ID_MSMPEG4V2, MKTAG('D', 'I', 'V', '2') },
+- { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', 'G', '4') },
+- { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', '4', '1') },
+- { CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') },
+- { CODEC_ID_WMV2, MKTAG('W', 'M', 'V', '2') },
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd') },
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'd') },
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') },
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'l') },
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '2', '5') },
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', '0') },
+- { CODEC_ID_DVVIDEO, MKTAG('c', 'd', 'v', 'c') }, /* Canopus DV */
+- { CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', 'H') }, /* Canopus DV */
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') },
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 's') },
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') },
+- { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '1') },
+- { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') },
+- { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', '2') },
+- { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'P', 'E', 'G') },
+- { CODEC_ID_MPEG1VIDEO, MKTAG('P', 'I', 'M', '1') },
+- { CODEC_ID_MPEG2VIDEO, MKTAG('P', 'I', 'M', '2') },
+- { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') },
+- { CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) },
+- { CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) },
+- { CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 16) },
+- { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') },
+- { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') },
+- { CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('s', 'l', 'i', 'f') },
+- { CODEC_ID_MPEG2VIDEO, MKTAG('E', 'M', '2', 'V') },
+- { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
+- { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
+- { CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') },
+- { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') },
+- { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') },
+- { CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */
+- { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */
+- { CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */
+- { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') },
+- { CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') },
+- { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') },
+- { CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') },
+- { CODEC_ID_MJPEG, MKTAG('Q', 'I', 'V', 'G') },
+- { CODEC_ID_MJPEG, MKTAG('S', 'L', 'M', 'J') }, /* SL M-JPEG */
+- { CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') }, /* Creative Webcam JPEG */
+- { CODEC_ID_MJPEG, MKTAG('I', 'J', 'L', 'V') }, /* Intel JPEG Library Video Codec */
+- { CODEC_ID_MJPEG, MKTAG('M', 'V', 'J', 'P') }, /* Midvid JPEG Video Codec */
+- { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') },
+- { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') },
+- { CODEC_ID_MJPEG, MKTAG('M', 'T', 'S', 'J') },
+- { CODEC_ID_MJPEG, MKTAG('Z', 'J', 'P', 'G') }, /* Paradigm Matrix M-JPEG Codec */
+- { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
+- { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },
+- { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') },
+- { CODEC_ID_RAWVIDEO, MKTAG( 0 , 0 , 0 , 0 ) },
+- { CODEC_ID_RAWVIDEO, MKTAG( 3 , 0 , 0 , 0 ) },
+- { CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') },
+- { CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'Y', '2') },
+- { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', '2') },
+- { CODEC_ID_RAWVIDEO, MKTAG('V', '4', '2', '2') },
+- { CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'N', 'V') },
+- { CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'V') },
+- { CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'Y') },
+- { CODEC_ID_RAWVIDEO, MKTAG('u', 'y', 'v', '1') },
+- { CODEC_ID_RAWVIDEO, MKTAG('2', 'V', 'u', '1') },
+- { CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') },
+- { CODEC_ID_RAWVIDEO, MKTAG('P', '4', '2', '2') },
+- { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '1', '2') },
+- { CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'V', 'Y') },
+- { CODEC_ID_RAWVIDEO, MKTAG('V', 'Y', 'U', 'Y') },
+- { CODEC_ID_RAWVIDEO, MKTAG('I', 'Y', 'U', 'V') },
+- { CODEC_ID_RAWVIDEO, MKTAG('Y', '8', '0', '0') },
+- { CODEC_ID_RAWVIDEO, MKTAG('H', 'D', 'Y', 'C') },
+- { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') },
+- { CODEC_ID_RAWVIDEO, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */
+- { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') },
+- { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') },
+- { CODEC_ID_INDEO4, MKTAG('I', 'V', '4', '1') },
+- { CODEC_ID_INDEO5, MKTAG('I', 'V', '5', '0') },
+- { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') },
+- { CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') },
+- { CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') },
+- { CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') },
+- { CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') },
+- { CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') },
+- { CODEC_ID_VP6F, MKTAG('V', 'P', '6', 'F') },
+- { CODEC_ID_VP6F, MKTAG('F', 'L', 'V', '4') },
+- { CODEC_ID_ASV1, MKTAG('A', 'S', 'V', '1') },
+- { CODEC_ID_ASV2, MKTAG('A', 'S', 'V', '2') },
+- { CODEC_ID_VCR1, MKTAG('V', 'C', 'R', '1') },
+- { CODEC_ID_FFV1, MKTAG('F', 'F', 'V', '1') },
+- { CODEC_ID_XAN_WC4, MKTAG('X', 'x', 'a', 'n') },
+- { CODEC_ID_MIMIC, MKTAG('L', 'M', '2', '0') },
+- { CODEC_ID_MSRLE, MKTAG('m', 'r', 'l', 'e') },
+- { CODEC_ID_MSRLE, MKTAG( 1 , 0 , 0 , 0 ) },
+- { CODEC_ID_MSRLE, MKTAG( 2 , 0 , 0 , 0 ) },
+- { CODEC_ID_MSVIDEO1, MKTAG('M', 'S', 'V', 'C') },
+- { CODEC_ID_MSVIDEO1, MKTAG('m', 's', 'v', 'c') },
+- { CODEC_ID_MSVIDEO1, MKTAG('C', 'R', 'A', 'M') },
+- { CODEC_ID_MSVIDEO1, MKTAG('c', 'r', 'a', 'm') },
+- { CODEC_ID_MSVIDEO1, MKTAG('W', 'H', 'A', 'M') },
+- { CODEC_ID_MSVIDEO1, MKTAG('w', 'h', 'a', 'm') },
+- { CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') },
+- { CODEC_ID_TRUEMOTION1, MKTAG('D', 'U', 'C', 'K') },
+- { 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') },
+- { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') },
+- { CODEC_ID_TSCC, MKTAG('t', 's', 'c', 'c') },
+- { CODEC_ID_ULTI, MKTAG('U', 'L', 'T', 'I') },
+- { CODEC_ID_VIXL, MKTAG('V', 'I', 'X', 'L') },
+- { CODEC_ID_QPEG, MKTAG('Q', 'P', 'E', 'G') },
+- { CODEC_ID_QPEG, MKTAG('Q', '1', '.', '0') },
+- { CODEC_ID_QPEG, MKTAG('Q', '1', '.', '1') },
+- { CODEC_ID_WMV3, MKTAG('W', 'M', 'V', '3') },
+- { CODEC_ID_VC1, MKTAG('W', 'V', 'C', '1') },
+- { CODEC_ID_VC1, MKTAG('W', 'M', 'V', 'A') },
+- { CODEC_ID_LOCO, MKTAG('L', 'O', 'C', 'O') },
+- { CODEC_ID_WNV1, MKTAG('W', 'N', 'V', '1') },
+- { CODEC_ID_AASC, MKTAG('A', 'A', 'S', 'C') },
+- { CODEC_ID_INDEO2, MKTAG('R', 'T', '2', '1') },
+- { CODEC_ID_FRAPS, MKTAG('F', 'P', 'S', '1') },
+- { CODEC_ID_THEORA, MKTAG('t', 'h', 'e', 'o') },
+- { CODEC_ID_TRUEMOTION2, MKTAG('T', 'M', '2', '0') },
+- { CODEC_ID_CSCD, MKTAG('C', 'S', 'C', 'D') },
+- { CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') },
+- { CODEC_ID_KMVC, MKTAG('K', 'M', 'V', 'C') },
+- { CODEC_ID_CAVS, MKTAG('C', 'A', 'V', 'S') },
+- { CODEC_ID_JPEG2000, MKTAG('M', 'J', '2', 'C') },
+- { CODEC_ID_VMNC, MKTAG('V', 'M', 'n', 'c') },
+- { CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') },
+- { CODEC_ID_PNG, MKTAG('M', 'P', 'N', 'G') },
+- { CODEC_ID_PNG, MKTAG('P', 'N', 'G', '1') },
+- { CODEC_ID_CLJR, MKTAG('c', 'l', 'j', 'r') },
+- { CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') },
+- { CODEC_ID_RPZA, MKTAG('a', 'z', 'p', 'r') },
+- { CODEC_ID_RPZA, MKTAG('R', 'P', 'Z', 'A') },
+- { CODEC_ID_RPZA, MKTAG('r', 'p', 'z', 'a') },
+- { CODEC_ID_SP5X, MKTAG('S', 'P', '5', '4') },
+- { CODEC_ID_NONE, 0 }
++ { AV_CODEC_ID_H264, MKTAG('H', '2', '6', '4') },
++ { AV_CODEC_ID_H264, MKTAG('h', '2', '6', '4') },
++ { AV_CODEC_ID_H264, MKTAG('X', '2', '6', '4') },
++ { AV_CODEC_ID_H264, MKTAG('x', '2', '6', '4') },
++ { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') },
++ { AV_CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') },
++ { AV_CODEC_ID_H263, MKTAG('H', '2', '6', '3') },
++ { AV_CODEC_ID_H263, MKTAG('X', '2', '6', '3') },
++ { AV_CODEC_ID_H263, MKTAG('T', '2', '6', '3') },
++ { AV_CODEC_ID_H263, MKTAG('L', '2', '6', '3') },
++ { AV_CODEC_ID_H263, MKTAG('V', 'X', '1', 'K') },
++ { AV_CODEC_ID_H263, MKTAG('Z', 'y', 'G', 'o') },
++ { AV_CODEC_ID_H263P, MKTAG('H', '2', '6', '3') },
++ { AV_CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */
++ { AV_CODEC_ID_H261, MKTAG('H', '2', '6', '1') },
++ { AV_CODEC_ID_H263P, MKTAG('U', '2', '6', '3') },
++ { AV_CODEC_ID_H263P, MKTAG('v', 'i', 'v', '1') },
++ { AV_CODEC_ID_MPEG4, MKTAG('F', 'M', 'P', '4') },
++ { AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') },
++ { AV_CODEC_ID_MPEG4, MKTAG('D', 'X', '5', '0') },
++ { AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') },
++ { AV_CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') },
++ { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') },
++ { AV_CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 0 ) }, /* some broken avi use this */
++ { AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') },
++ { AV_CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') },
++ { AV_CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
++ { AV_CODEC_ID_MPEG4, MKTAG('U', 'M', 'P', '4') },
++ { AV_CODEC_ID_MPEG4, MKTAG('W', 'V', '1', 'F') },
++ { AV_CODEC_ID_MPEG4, MKTAG('S', 'E', 'D', 'G') },
++ { AV_CODEC_ID_MPEG4, MKTAG('R', 'M', 'P', '4') },
++ { AV_CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') },
++ { AV_CODEC_ID_MPEG4, MKTAG('F', 'F', 'D', 'S') },
++ { AV_CODEC_ID_MPEG4, MKTAG('F', 'V', 'F', 'W') },
++ { AV_CODEC_ID_MPEG4, MKTAG('D', 'C', 'O', 'D') },
++ { AV_CODEC_ID_MPEG4, MKTAG('M', 'V', 'X', 'M') },
++ { AV_CODEC_ID_MPEG4, MKTAG('P', 'M', '4', 'V') },
++ { AV_CODEC_ID_MPEG4, MKTAG('S', 'M', 'P', '4') },
++ { AV_CODEC_ID_MPEG4, MKTAG('D', 'X', 'G', 'M') },
++ { AV_CODEC_ID_MPEG4, MKTAG('V', 'I', 'D', 'M') },
++ { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'T', '3') },
++ { AV_CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'X') },
++ { AV_CODEC_ID_MPEG4, MKTAG('H', 'D', 'X', '4') }, /* flipped video */
++ { AV_CODEC_ID_MPEG4, MKTAG('D', 'M', 'K', '2') },
++ { AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'G', 'I') },
++ { AV_CODEC_ID_MPEG4, MKTAG('I', 'N', 'M', 'C') },
++ { AV_CODEC_ID_MPEG4, MKTAG('E', 'P', 'H', 'V') }, /* Ephv MPEG-4 */
++ { AV_CODEC_ID_MPEG4, MKTAG('E', 'M', '4', 'A') },
++ { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'C', 'C') }, /* Divio MPEG-4 */
++ { AV_CODEC_ID_MPEG4, MKTAG('S', 'N', '4', '0') },
++ { AV_CODEC_ID_MPEG4, MKTAG('V', 'S', 'P', 'X') },
++ { AV_CODEC_ID_MPEG4, MKTAG('U', 'L', 'D', 'X') },
++ { AV_CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'V') },
++ { AV_CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */
++ { AV_CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */
++ { AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
++ { AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') },
++ { AV_CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '5') },
++ { AV_CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '6') },
++ { AV_CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '4') },
++ { AV_CODEC_ID_MSMPEG4V3, MKTAG('D', 'V', 'X', '3') },
++ { AV_CODEC_ID_MSMPEG4V3, MKTAG('A', 'P', '4', '1') },
++ { AV_CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '1') },
++ { AV_CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '0') },
++ { AV_CODEC_ID_MSMPEG4V2, MKTAG('M', 'P', '4', '2') },
++ { AV_CODEC_ID_MSMPEG4V2, MKTAG('D', 'I', 'V', '2') },
++ { AV_CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', 'G', '4') },
++ { AV_CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', '4', '1') },
++ { AV_CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') },
++ { AV_CODEC_ID_WMV2, MKTAG('W', 'M', 'V', '2') },
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd') },
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'd') },
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') },
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'l') },
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', '2', '5') },
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', '0') },
++ { AV_CODEC_ID_DVVIDEO, MKTAG('c', 'd', 'v', 'c') }, /* Canopus DV */
++ { AV_CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', 'H') }, /* Canopus DV */
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') },
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 's') },
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') },
++ { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '1') },
++ { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') },
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', '2') },
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', 'P', 'E', 'G') },
++ { AV_CODEC_ID_MPEG1VIDEO, MKTAG('P', 'I', 'M', '1') },
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('P', 'I', 'M', '2') },
++ { AV_CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') },
++ { AV_CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) },
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) },
++ { AV_CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 16) },
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') },
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') },
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('s', 'l', 'i', 'f') },
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('E', 'M', '2', 'V') },
++ { AV_CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
++ { AV_CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
++ { AV_CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') },
++ { AV_CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') },
++ { AV_CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') },
++ { AV_CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */
++ { AV_CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */
++ { AV_CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */
++ { AV_CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') },
++ { AV_CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') },
++ { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') },
++ { AV_CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') },
++ { AV_CODEC_ID_MJPEG, MKTAG('Q', 'I', 'V', 'G') },
++ { AV_CODEC_ID_MJPEG, MKTAG('S', 'L', 'M', 'J') }, /* SL M-JPEG */
++ { AV_CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') }, /* Creative Webcam JPEG */
++ { AV_CODEC_ID_MJPEG, MKTAG('I', 'J', 'L', 'V') }, /* Intel JPEG Library Video Codec */
++ { AV_CODEC_ID_MJPEG, MKTAG('M', 'V', 'J', 'P') }, /* Midvid JPEG Video Codec */
++ { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') },
++ { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') },
++ { AV_CODEC_ID_MJPEG, MKTAG('M', 'T', 'S', 'J') },
++ { AV_CODEC_ID_MJPEG, MKTAG('Z', 'J', 'P', 'G') }, /* Paradigm Matrix M-JPEG Codec */
++ { AV_CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
++ { AV_CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },
++ { AV_CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG( 0 , 0 , 0 , 0 ) },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG( 3 , 0 , 0 , 0 ) },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'Y', '2') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', '2') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('V', '4', '2', '2') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'N', 'V') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'V') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'Y') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('u', 'y', 'v', '1') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('2', 'V', 'u', '1') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('P', '4', '2', '2') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '1', '2') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'V', 'Y') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('V', 'Y', 'U', 'Y') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('I', 'Y', 'U', 'V') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '8', '0', '0') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('H', 'D', 'Y', 'C') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */
++ { AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') },
++ { AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') },
++ { AV_CODEC_ID_INDEO4, MKTAG('I', 'V', '4', '1') },
++ { AV_CODEC_ID_INDEO5, MKTAG('I', 'V', '5', '0') },
++ { AV_CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') },
++ { AV_CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') },
++ { AV_CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') },
++ { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') },
++ { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') },
++ { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') },
++ { AV_CODEC_ID_VP6F, MKTAG('V', 'P', '6', 'F') },
++ { AV_CODEC_ID_VP6F, MKTAG('F', 'L', 'V', '4') },
++ { AV_CODEC_ID_ASV1, MKTAG('A', 'S', 'V', '1') },
++ { AV_CODEC_ID_ASV2, MKTAG('A', 'S', 'V', '2') },
++ { AV_CODEC_ID_VCR1, MKTAG('V', 'C', 'R', '1') },
++ { AV_CODEC_ID_FFV1, MKTAG('F', 'F', 'V', '1') },
++ { AV_CODEC_ID_XAN_WC4, MKTAG('X', 'x', 'a', 'n') },
++ { AV_CODEC_ID_MIMIC, MKTAG('L', 'M', '2', '0') },
++ { AV_CODEC_ID_MSRLE, MKTAG('m', 'r', 'l', 'e') },
++ { AV_CODEC_ID_MSRLE, MKTAG( 1 , 0 , 0 , 0 ) },
++ { AV_CODEC_ID_MSRLE, MKTAG( 2 , 0 , 0 , 0 ) },
++ { AV_CODEC_ID_MSVIDEO1, MKTAG('M', 'S', 'V', 'C') },
++ { AV_CODEC_ID_MSVIDEO1, MKTAG('m', 's', 'v', 'c') },
++ { AV_CODEC_ID_MSVIDEO1, MKTAG('C', 'R', 'A', 'M') },
++ { AV_CODEC_ID_MSVIDEO1, MKTAG('c', 'r', 'a', 'm') },
++ { AV_CODEC_ID_MSVIDEO1, MKTAG('W', 'H', 'A', 'M') },
++ { AV_CODEC_ID_MSVIDEO1, MKTAG('w', 'h', 'a', 'm') },
++ { AV_CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') },
++ { AV_CODEC_ID_TRUEMOTION1, MKTAG('D', 'U', 'C', 'K') },
++ { AV_CODEC_ID_TRUEMOTION1, MKTAG('P', 'V', 'E', 'Z') },
++ { AV_CODEC_ID_MSZH, MKTAG('M', 'S', 'Z', 'H') },
++ { AV_CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') },
++ /* { AV_CODEC_ID_SNOW, MKTAG('S', 'N', 'O', 'W') }, */
++ { AV_CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') },
++ { AV_CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') },
++ { AV_CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') },
++ { AV_CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') },
++ { AV_CODEC_ID_TSCC, MKTAG('t', 's', 'c', 'c') },
++ { AV_CODEC_ID_ULTI, MKTAG('U', 'L', 'T', 'I') },
++ { AV_CODEC_ID_VIXL, MKTAG('V', 'I', 'X', 'L') },
++ { AV_CODEC_ID_QPEG, MKTAG('Q', 'P', 'E', 'G') },
++ { AV_CODEC_ID_QPEG, MKTAG('Q', '1', '.', '0') },
++ { AV_CODEC_ID_QPEG, MKTAG('Q', '1', '.', '1') },
++ { AV_CODEC_ID_WMV3, MKTAG('W', 'M', 'V', '3') },
++ { AV_CODEC_ID_VC1, MKTAG('W', 'V', 'C', '1') },
++ { AV_CODEC_ID_VC1, MKTAG('W', 'M', 'V', 'A') },
++ { AV_CODEC_ID_LOCO, MKTAG('L', 'O', 'C', 'O') },
++ { AV_CODEC_ID_WNV1, MKTAG('W', 'N', 'V', '1') },
++ { AV_CODEC_ID_AASC, MKTAG('A', 'A', 'S', 'C') },
++ { AV_CODEC_ID_INDEO2, MKTAG('R', 'T', '2', '1') },
++ { AV_CODEC_ID_FRAPS, MKTAG('F', 'P', 'S', '1') },
++ { AV_CODEC_ID_THEORA, MKTAG('t', 'h', 'e', 'o') },
++ { AV_CODEC_ID_TRUEMOTION2, MKTAG('T', 'M', '2', '0') },
++ { AV_CODEC_ID_CSCD, MKTAG('C', 'S', 'C', 'D') },
++ { AV_CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') },
++ { AV_CODEC_ID_KMVC, MKTAG('K', 'M', 'V', 'C') },
++ { AV_CODEC_ID_CAVS, MKTAG('C', 'A', 'V', 'S') },
++ { AV_CODEC_ID_JPEG2000, MKTAG('M', 'J', '2', 'C') },
++ { AV_CODEC_ID_VMNC, MKTAG('V', 'M', 'n', 'c') },
++ { AV_CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') },
++ { AV_CODEC_ID_PNG, MKTAG('M', 'P', 'N', 'G') },
++ { AV_CODEC_ID_PNG, MKTAG('P', 'N', 'G', '1') },
++ { AV_CODEC_ID_CLJR, MKTAG('c', 'l', 'j', 'r') },
++ { AV_CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') },
++ { AV_CODEC_ID_RPZA, MKTAG('a', 'z', 'p', 'r') },
++ { AV_CODEC_ID_RPZA, MKTAG('R', 'P', 'Z', 'A') },
++ { AV_CODEC_ID_RPZA, MKTAG('r', 'p', 'z', 'a') },
++ { AV_CODEC_ID_SP5X, MKTAG('S', 'P', '5', '4') },
++ { AV_CODEC_ID_NONE, 0 }
+ };
+
+
+--- lives-2.2.2~ds0.orig/lives-plugins/plugins/decoders/mkv_decoder.c
++++ lives-2.2.2~ds0/lives-plugins/plugins/decoders/mkv_decoder.c
+@@ -70,7 +70,7 @@ const char *plugin_version="LiVES mkv de
+
+ #include "decplugin.h"
+
+-#include <libavutil/intfloat_readwrite.h>
++// #include <libavutil/intfloat_readwrite.h>
+ #include <libavutil/intreadwrite.h>
+ #include <libavutil/lzo.h>
+ #include <libavutil/dict.h>
+@@ -83,7 +83,7 @@ const char *plugin_version="LiVES mkv de
+ #define CODEC_ID_SSA AV_CODEC_ID_SSA
+ #define CODEC_ID_VP8 AV_CODEC_ID_VP8
+ #define CODEC_ID_THEORA AV_CODEC_ID_THEORA
+-#define CODEC_ID_SNOW AV_CODEC_ID_SNOW
++/* #define CODEC_ID_SNOW AV_CODEC_ID_SNOW */
+ #define CODEC_ID_DIRAC AV_CODEC_ID_DIRAC
+ #define CODEC_ID_MJPEG AV_CODEC_ID_MJPEG
+ #define CODEC_ID_MPEG1VIDEO AV_CODEC_ID_MPEG1VIDEO
+@@ -111,10 +111,13 @@ const char *plugin_version="LiVES mkv de
+ #define av_new_stream(a, b) avformat_new_stream(a, NULL)
+ #endif
+
+-#if HAVE_AVPRIV_SET_PTS_INFO
+-#define av_set_pts_info(a,b,c,d) avpriv_set_pts_info(a,b,c,d)
+-#endif
+-
++#define av_set_pts_info(s, p_wrap_bits, pts_num, pts_den) \
++ do { \
++ AVRational new_tb; \
++ av_reduce(&new_tb.num, &new_tb.den, pts_num, pts_den, INT_MAX); \
++ s->time_base = new_tb; \
++ s->pts_wrap_bits = p_wrap_bits; \
++ } while (0);
+
+ #include "mkv_decoder.h"
+
+@@ -146,6 +149,22 @@ const uint8_t ff_log2_tab[256]={
+ };
+
+
++#define av_int2flt lives_int2flt
++#define av_int2dbl lives_int2dbl
++
++static double lives_int2dbl(int64_t v) {
++ if((uint64_t)v+v > 0xFFEULL<<52)
++ return NAN;
++ return ldexp(((v&((1LL<<52)-1)) + (1LL<<52)) * (v>>63|1), (v>>52&0x7FF)-1075);
++}
++
++static float lives_int2flt(int32_t v) {
++ if((uint32_t)v+v > 0xFF000000U)
++ return NAN;
++ return ldexp(((v&0x7FFFFF) + (1<<23)) * (v>>31|1), (v>>23&0xFF)-150);
++}
++
++
+ static enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag)
+ {
+ int i;
+@@ -1639,7 +1658,7 @@ static int lives_mkv_read_header(lives_c
+ 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_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;
+--- lives-2.2.2~ds0.orig/lives-plugins/plugins/decoders/mpegts_decoder.h
++++ lives-2.2.2~ds0/lives-plugins/plugins/decoders/mpegts_decoder.h
+@@ -286,43 +286,43 @@ static inline void skip_bits_long(GetBit
+ /* http://www.mp4ra.org */
+ /* ordered by muxing preference */
+ const AVCodecTag ff_mp4_obj_type[] = {
+- { CODEC_ID_MOV_TEXT , 0x08 },
+- { CODEC_ID_MPEG4 , 0x20 },
+- { CODEC_ID_H264 , 0x21 },
+- { CODEC_ID_AAC , 0x40 },
+- { CODEC_ID_MP4ALS , 0x40 }, /* 14496-3 ALS */
+- { CODEC_ID_MPEG2VIDEO, 0x61 }, /* MPEG2 Main */
+- { CODEC_ID_MPEG2VIDEO, 0x60 }, /* MPEG2 Simple */
+- { CODEC_ID_MPEG2VIDEO, 0x62 }, /* MPEG2 SNR */
+- { CODEC_ID_MPEG2VIDEO, 0x63 }, /* MPEG2 Spatial */
+- { CODEC_ID_MPEG2VIDEO, 0x64 }, /* MPEG2 High */
+- { CODEC_ID_MPEG2VIDEO, 0x65 }, /* MPEG2 422 */
+- { CODEC_ID_AAC , 0x66 }, /* MPEG2 AAC Main */
+- { CODEC_ID_AAC , 0x67 }, /* MPEG2 AAC Low */
+- { CODEC_ID_AAC , 0x68 }, /* MPEG2 AAC SSR */
+- { CODEC_ID_MP3 , 0x69 }, /* 13818-3 */
+- { CODEC_ID_MP2 , 0x69 }, /* 11172-3 */
+- { CODEC_ID_MPEG1VIDEO, 0x6A }, /* 11172-2 */
+- { CODEC_ID_MP3 , 0x6B }, /* 11172-3 */
+- { CODEC_ID_MJPEG , 0x6C }, /* 10918-1 */
+- { CODEC_ID_PNG , 0x6D },
+- { CODEC_ID_JPEG2000 , 0x6E }, /* 15444-1 */
+- { CODEC_ID_VC1 , 0xA3 },
+- { CODEC_ID_DIRAC , 0xA4 },
+- { CODEC_ID_AC3 , 0xA5 },
+- { CODEC_ID_DTS , 0xA9 }, /* mp4ra.org */
+- { CODEC_ID_VORBIS , 0xDD }, /* non standard, gpac uses it */
+- { CODEC_ID_DVD_SUBTITLE, 0xE0 }, /* non standard, see unsupported-embedded-subs-2.mp4 */
+- { CODEC_ID_QCELP , 0xE1 },
+- { CODEC_ID_MPEG4SYSTEMS, 0x01 },
+- { CODEC_ID_MPEG4SYSTEMS, 0x02 },
+- { CODEC_ID_NONE , 0 },
++ { AV_CODEC_ID_MOV_TEXT , 0x08 },
++ { AV_CODEC_ID_MPEG4 , 0x20 },
++ { AV_CODEC_ID_H264 , 0x21 },
++ { AV_CODEC_ID_AAC , 0x40 },
++ { AV_CODEC_ID_MP4ALS , 0x40 }, /* 14496-3 ALS */
++ { AV_CODEC_ID_MPEG2VIDEO, 0x61 }, /* MPEG2 Main */
++ { AV_CODEC_ID_MPEG2VIDEO, 0x60 }, /* MPEG2 Simple */
++ { AV_CODEC_ID_MPEG2VIDEO, 0x62 }, /* MPEG2 SNR */
++ { AV_CODEC_ID_MPEG2VIDEO, 0x63 }, /* MPEG2 Spatial */
++ { AV_CODEC_ID_MPEG2VIDEO, 0x64 }, /* MPEG2 High */
++ { AV_CODEC_ID_MPEG2VIDEO, 0x65 }, /* MPEG2 422 */
++ { AV_CODEC_ID_AAC , 0x66 }, /* MPEG2 AAC Main */
++ { AV_CODEC_ID_AAC , 0x67 }, /* MPEG2 AAC Low */
++ { AV_CODEC_ID_AAC , 0x68 }, /* MPEG2 AAC SSR */
++ { AV_CODEC_ID_MP3 , 0x69 }, /* 13818-3 */
++ { AV_CODEC_ID_MP2 , 0x69 }, /* 11172-3 */
++ { AV_CODEC_ID_MPEG1VIDEO, 0x6A }, /* 11172-2 */
++ { AV_CODEC_ID_MP3 , 0x6B }, /* 11172-3 */
++ { AV_CODEC_ID_MJPEG , 0x6C }, /* 10918-1 */
++ { AV_CODEC_ID_PNG , 0x6D },
++ { AV_CODEC_ID_JPEG2000 , 0x6E }, /* 15444-1 */
++ { AV_CODEC_ID_VC1 , 0xA3 },
++ { AV_CODEC_ID_DIRAC , 0xA4 },
++ { AV_CODEC_ID_AC3 , 0xA5 },
++ { AV_CODEC_ID_DTS , 0xA9 }, /* mp4ra.org */
++ { AV_CODEC_ID_VORBIS , 0xDD }, /* non standard, gpac uses it */
++ { AV_CODEC_ID_DVD_SUBTITLE, 0xE0 }, /* non standard, see unsupported-embedded-subs-2.mp4 */
++ { AV_CODEC_ID_QCELP , 0xE1 },
++ { AV_CODEC_ID_MPEG4SYSTEMS, 0x01 },
++ { AV_CODEC_ID_MPEG4SYSTEMS, 0x02 },
++ { AV_CODEC_ID_NONE , 0 },
+ };
+
+
+-#define CODEC_ID_FIRST_AUDIO 0x10000
+-#define CODEC_ID_FIRST_SUBTITLE 0x17000
+-#define CODEC_ID_FIRST_UNKNOWN 0x18000
++#define AV_CODEC_ID_FIRST_AUDIO 0x10000
++#define AV_CODEC_ID_FIRST_SUBTITLE 0x17000
++#define AV_CODEC_ID_FIRST_UNKNOWN 0x18000
+
+
+
+--- lives-2.2.2~ds0.orig/lives-plugins/plugins/decoders/mkv_decoder.h
++++ lives-2.2.2~ds0/lives-plugins/plugins/decoders/mkv_decoder.h
+@@ -282,76 +282,76 @@ extern const char * const matroska_video
+ extern const char * const matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT];*/
+
+ const CodecTags ff_mkv_codec_tags[]={
+- {"A_AAC" , CODEC_ID_AAC},
+- {"A_AC3" , CODEC_ID_AC3},
+- {"A_DTS" , CODEC_ID_DTS},
+- {"A_EAC3" , CODEC_ID_EAC3},
+- {"A_FLAC" , CODEC_ID_FLAC},
+- {"A_MLP" , CODEC_ID_MLP},
+- {"A_MPEG/L2" , CODEC_ID_MP2},
+- {"A_MPEG/L1" , CODEC_ID_MP2},
+- {"A_MPEG/L3" , CODEC_ID_MP3},
+- {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F32LE},
+- {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F64LE},
+- {"A_PCM/INT/BIG" , CODEC_ID_PCM_S16BE},
+- {"A_PCM/INT/BIG" , CODEC_ID_PCM_S24BE},
+- {"A_PCM/INT/BIG" , CODEC_ID_PCM_S32BE},
+- {"A_PCM/INT/LIT" , CODEC_ID_PCM_S16LE},
+- {"A_PCM/INT/LIT" , CODEC_ID_PCM_S24LE},
+- {"A_PCM/INT/LIT" , CODEC_ID_PCM_S32LE},
+- {"A_PCM/INT/LIT" , CODEC_ID_PCM_U8},
+- {"A_QUICKTIME/QDM2" , CODEC_ID_QDM2},
+- {"A_REAL/14_4" , CODEC_ID_RA_144},
+- {"A_REAL/28_8" , CODEC_ID_RA_288},
+- {"A_REAL/ATRC" , CODEC_ID_ATRAC3},
+- {"A_REAL/COOK" , CODEC_ID_COOK},
+- {"A_REAL/SIPR" , CODEC_ID_SIPR},
+- {"A_TRUEHD" , CODEC_ID_TRUEHD},
+- {"A_TTA1" , CODEC_ID_TTA},
+- {"A_VORBIS" , CODEC_ID_VORBIS},
+- {"A_WAVPACK4" , CODEC_ID_WAVPACK},
+-
+- {"S_TEXT/UTF8" , CODEC_ID_TEXT},
+- {"S_TEXT/UTF8" , CODEC_ID_SRT},
+- {"S_TEXT/ASCII" , CODEC_ID_TEXT},
+- {"S_TEXT/ASS" , CODEC_ID_SSA},
+- {"S_TEXT/SSA" , CODEC_ID_SSA},
+- {"S_ASS" , CODEC_ID_SSA},
+- {"S_SSA" , CODEC_ID_SSA},
+- {"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE},
+- {"S_HDMV/PGS" , CODEC_ID_HDMV_PGS_SUBTITLE},
+-
+- {"V_DIRAC" , CODEC_ID_DIRAC},
+- {"V_MJPEG" , CODEC_ID_MJPEG},
+- {"V_MPEG1" , CODEC_ID_MPEG1VIDEO},
+- {"V_MPEG2" , CODEC_ID_MPEG2VIDEO},
+- {"V_MPEG4/ISO/ASP" , CODEC_ID_MPEG4},
+- {"V_MPEG4/ISO/AP" , CODEC_ID_MPEG4},
+- {"V_MPEG4/ISO/SP" , CODEC_ID_MPEG4},
+- {"V_MPEG4/ISO/AVC" , CODEC_ID_H264},
+- {"V_MPEG4/MS/V3" , CODEC_ID_MSMPEG4V3},
+- {"V_REAL/RV10" , CODEC_ID_RV10},
+- {"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_AAC" , AV_CODEC_ID_AAC},
++ {"A_AC3" , AV_CODEC_ID_AC3},
++ {"A_DTS" , AV_CODEC_ID_DTS},
++ {"A_EAC3" , AV_CODEC_ID_EAC3},
++ {"A_FLAC" , AV_CODEC_ID_FLAC},
++ {"A_MLP" , AV_CODEC_ID_MLP},
++ {"A_MPEG/L2" , AV_CODEC_ID_MP2},
++ {"A_MPEG/L1" , AV_CODEC_ID_MP2},
++ {"A_MPEG/L3" , AV_CODEC_ID_MP3},
++ {"A_PCM/FLOAT/IEEE" , AV_CODEC_ID_PCM_F32LE},
++ {"A_PCM/FLOAT/IEEE" , AV_CODEC_ID_PCM_F64LE},
++ {"A_PCM/INT/BIG" , AV_CODEC_ID_PCM_S16BE},
++ {"A_PCM/INT/BIG" , AV_CODEC_ID_PCM_S24BE},
++ {"A_PCM/INT/BIG" , AV_CODEC_ID_PCM_S32BE},
++ {"A_PCM/INT/LIT" , AV_CODEC_ID_PCM_S16LE},
++ {"A_PCM/INT/LIT" , AV_CODEC_ID_PCM_S24LE},
++ {"A_PCM/INT/LIT" , AV_CODEC_ID_PCM_S32LE},
++ {"A_PCM/INT/LIT" , AV_CODEC_ID_PCM_U8},
++ {"A_QUICKTIME/QDM2" , AV_CODEC_ID_QDM2},
++ {"A_REAL/14_4" , AV_CODEC_ID_RA_144},
++ {"A_REAL/28_8" , AV_CODEC_ID_RA_288},
++ {"A_REAL/ATRC" , AV_CODEC_ID_ATRAC3},
++ {"A_REAL/COOK" , AV_CODEC_ID_COOK},
++ {"A_REAL/SIPR" , AV_CODEC_ID_SIPR},
++ {"A_TRUEHD" , AV_CODEC_ID_TRUEHD},
++ {"A_TTA1" , AV_CODEC_ID_TTA},
++ {"A_VORBIS" , AV_CODEC_ID_VORBIS},
++ {"A_WAVPACK4" , AV_CODEC_ID_WAVPACK},
++
++ {"S_TEXT/UTF8" , AV_CODEC_ID_TEXT},
++ {"S_TEXT/UTF8" , AV_CODEC_ID_SRT},
++ {"S_TEXT/ASCII" , AV_CODEC_ID_TEXT},
++ {"S_TEXT/ASS" , AV_CODEC_ID_SSA},
++ {"S_TEXT/SSA" , AV_CODEC_ID_SSA},
++ {"S_ASS" , AV_CODEC_ID_SSA},
++ {"S_SSA" , AV_CODEC_ID_SSA},
++ {"S_VOBSUB" , AV_CODEC_ID_DVD_SUBTITLE},
++ {"S_HDMV/PGS" , AV_CODEC_ID_HDMV_PGS_SUBTITLE},
++
++ {"V_DIRAC" , AV_CODEC_ID_DIRAC},
++ {"V_MJPEG" , AV_CODEC_ID_MJPEG},
++ {"V_MPEG1" , AV_CODEC_ID_MPEG1VIDEO},
++ {"V_MPEG2" , AV_CODEC_ID_MPEG2VIDEO},
++ {"V_MPEG4/ISO/ASP" , AV_CODEC_ID_MPEG4},
++ {"V_MPEG4/ISO/AP" , AV_CODEC_ID_MPEG4},
++ {"V_MPEG4/ISO/SP" , AV_CODEC_ID_MPEG4},
++ {"V_MPEG4/ISO/AVC" , AV_CODEC_ID_H264},
++ {"V_MPEG4/MS/V3" , AV_CODEC_ID_MSMPEG4V3},
++ {"V_REAL/RV10" , AV_CODEC_ID_RV10},
++ {"V_REAL/RV20" , AV_CODEC_ID_RV20},
++ {"V_REAL/RV30" , AV_CODEC_ID_RV30},
++ {"V_REAL/RV40" , AV_CODEC_ID_RV40},
++ /* {"V_SNOW" , AV_CODEC_ID_SNOW}, */
++ {"V_THEORA" , AV_CODEC_ID_THEORA},
++ {"V_UNCOMPRESSED" , AV_CODEC_ID_RAWVIDEO},
++ {"V_VP8" , AV_CODEC_ID_VP8},
+
+- {"" , CODEC_ID_NONE}
++ {"" , AV_CODEC_ID_NONE}
+ };
+
+ const CodecMime ff_mkv_mime_tags[] = {
+- {"text/plain" , CODEC_ID_TEXT},
+- {"image/gif" , CODEC_ID_GIF},
+- {"image/jpeg" , CODEC_ID_MJPEG},
+- {"image/png" , CODEC_ID_PNG},
+- {"image/tiff" , CODEC_ID_TIFF},
+- {"application/x-truetype-font", CODEC_ID_TTF},
+- {"application/x-font" , CODEC_ID_TTF},
++ {"text/plain" , AV_CODEC_ID_TEXT},
++ {"image/gif" , AV_CODEC_ID_GIF},
++ {"image/jpeg" , AV_CODEC_ID_MJPEG},
++ {"image/png" , AV_CODEC_ID_PNG},
++ {"image/tiff" , AV_CODEC_ID_TIFF},
++ {"application/x-truetype-font", AV_CODEC_ID_TTF},
++ {"application/x-font" , AV_CODEC_ID_TTF},
+
+- {"" , CODEC_ID_NONE}
++ {"" , AV_CODEC_ID_NONE}
+ };
+
+
+@@ -874,160 +874,160 @@ static EbmlSyntax matroska_clusters[] =
+
+
+ const AVCodecTag codec_movvideo_tags[] = {
+-/* { CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */
++/* { AV_CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */
+
+- { CODEC_ID_RAWVIDEO, MKTAG('r', 'a', 'w', ' ') }, /* Uncompressed RGB */
+- { CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', '2') }, /* Uncompressed YUV422 */
+- { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'U', 'I') }, /* YUV with alpha-channel (AVID Uncompressed) */
+- { CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* UNCOMPRESSED 8BIT 4:2:2 */
+- { CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2vuy but byte swapped */
+-
+- { CODEC_ID_RAWVIDEO, MKTAG('L', '5', '5', '5') },
+- { CODEC_ID_RAWVIDEO, MKTAG('L', '5', '6', '5') },
+- { CODEC_ID_RAWVIDEO, MKTAG('B', '5', '6', '5') },
+- { CODEC_ID_RAWVIDEO, MKTAG('2', '4', 'B', 'G') },
+- { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') },
+- { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') },
+- { CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') },
+- { CODEC_ID_RAWVIDEO, MKTAG('b', '1', '6', 'g') },
+- { CODEC_ID_RAWVIDEO, MKTAG('b', '4', '8', 'r') },
+- { CODEC_ID_RAWVIDEO, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */
+-
+- { CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') }, /* UNCOMPRESSED 10BIT RGB */
+- { CODEC_ID_R10K, MKTAG('R', '1', '0', 'g') }, /* UNCOMPRESSED 10BIT RGB */
+- { CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, /* UNCOMPRESSED 10BIT RGB */
+- { CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */
+-
+- { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */
+- { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */
+- { CODEC_ID_MJPEG, MKTAG('A', 'V', 'D', 'J') }, /* MJPEG with alpha-channel (AVID JFIF meridien compressed) */
+-/* { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, *//* MJPEG with alpha-channel (AVID ABVB/Truevision NuVista) */
+- { CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, /* Motion JPEG OpenDML */
+- { CODEC_ID_MJPEGB, MKTAG('m', 'j', 'p', 'b') }, /* Motion-JPEG (format B) */
+-
+- { CODEC_ID_SVQ1, MKTAG('S', 'V', 'Q', '1') }, /* Sorenson Video v1 */
+- { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, /* Sorenson Video v1 */
+- { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', 'i') }, /* Sorenson Video v1 (from QT specs)*/
+- { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, /* Sorenson Video v3 */
+-
+- { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
+- { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, /* OpenDiVX *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */
+- { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') },
+- { CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, /* experimental: 3IVX files before ivx D4 4.5.1 */
+-
+- { CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, /* H263 */
+- { CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, /* H263 ?? works */
+-
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'p', 'p') }, /* DVCPRO PAL produced by FCP */
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'p') }, /* DVCPRO50 PAL produced by FCP */
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'n') }, /* DVCPRO50 NTSC produced by FCP */
+- { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, /* AVID DV */
+- { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', '1') }, /* AVID DV100 */
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'q') }, /* DVCPRO HD 720p50 */
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'p') }, /* DVCPRO HD 720p60 */
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') },
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '2') },
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '4') },
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '5') }, /* DVCPRO HD 50i produced by FCP */
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '6') }, /* DVCPRO HD 60i produced by FCP */
+- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '3') }, /* DVCPRO HD 30p produced by FCP */
+-
+- { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, /* On2 VP3 */
+- { CODEC_ID_RPZA, MKTAG('r', 'p', 'z', 'a') }, /* Apple Video (RPZA) */
+- { CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, /* Cinepak */
+- { CODEC_ID_8BPS, MKTAG('8', 'B', 'P', 'S') }, /* Planar RGB (8BPS) */
+- { CODEC_ID_SMC, MKTAG('s', 'm', 'c', ' ') }, /* Apple Graphics (SMC) */
+- { CODEC_ID_QTRLE, MKTAG('r', 'l', 'e', ' ') }, /* Apple Animation (RLE) */
+- { CODEC_ID_MSRLE, MKTAG('W', 'R', 'L', 'E') },
+- { CODEC_ID_QDRAW, MKTAG('q', 'd', 'r', 'w') }, /* QuickDraw */
+-
+- { CODEC_ID_RAWVIDEO, MKTAG('W', 'R', 'A', 'W') },
+-
+- { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */
+- { CODEC_ID_H264, MKTAG('a', 'i', '5', 'p') }, /* AVC-Intra 50M 720p24/30/60 */
+- { CODEC_ID_H264, MKTAG('a', 'i', '5', 'q') }, /* AVC-Intra 50M 720p25/50 */
+- { CODEC_ID_H264, MKTAG('a', 'i', '5', '2') }, /* AVC-Intra 50M 1080p25/50 */
+- { CODEC_ID_H264, MKTAG('a', 'i', '5', '3') }, /* AVC-Intra 50M 1080p24/30/60 */
+- { CODEC_ID_H264, MKTAG('a', 'i', '5', '5') }, /* AVC-Intra 50M 1080i50 */
+- { CODEC_ID_H264, MKTAG('a', 'i', '5', '6') }, /* AVC-Intra 50M 1080i60 */
+- { CODEC_ID_H264, MKTAG('a', 'i', '1', 'p') }, /* AVC-Intra 100M 720p24/30/60 */
+- { CODEC_ID_H264, MKTAG('a', 'i', '1', 'q') }, /* AVC-Intra 100M 720p25/50 */
+- { CODEC_ID_H264, MKTAG('a', 'i', '1', '2') }, /* AVC-Intra 100M 1080p25/50 */
+- { CODEC_ID_H264, MKTAG('a', 'i', '1', '3') }, /* AVC-Intra 100M 1080p24/30/60 */
+- { CODEC_ID_H264, MKTAG('a', 'i', '1', '5') }, /* AVC-Intra 100M 1080i50 */
+- { CODEC_ID_H264, MKTAG('a', 'i', '1', '6') }, /* AVC-Intra 100M 1080i60 */
+-
+- { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */
+- { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */
+- { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', ' ') },
+- { CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '1') }, /* Apple MPEG-2 Camcorder */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* MPEG2 HDV 1080i50 */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '5') }, /* MPEG2 HDV 720p25 */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '6') }, /* MPEG2 HDV 1080p24 */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '7') }, /* MPEG2 HDV 1080p25 */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '8') }, /* MPEG2 HDV 1080p30 */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'n') }, /* MPEG2 IMX NTSC 525/60 50mb/s produced by FCP */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'p') }, /* MPEG2 IMX PAL 625/50 50mb/s produced by FCP */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'n') }, /* MPEG2 IMX NTSC 525/60 40mb/s produced by FCP */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'p') }, /* MPEG2 IMX PAL 625/50 40mb/s produced by FCP */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'n') }, /* MPEG2 IMX NTSC 525/60 30mb/s produced by FCP */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'p') }, /* MPEG2 IMX PAL 625/50 30mb/s produced by FCP */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '4') }, /* XDCAM HD422 720p24 CBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '5') }, /* XDCAM HD422 720p25 CBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '9') }, /* XDCAM HD422 720p60 CBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'a') }, /* XDCAM HD422 720p50 CBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'b') }, /* XDCAM HD422 1080i60 CBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'c') }, /* XDCAM HD422 1080i50 CBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'd') }, /* XDCAM HD422 1080p24 CBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'e') }, /* XDCAM HD422 1080p25 CBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'f') }, /* XDCAM HD422 1080p30 CBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '1') }, /* XDCAM EX 720p30 VBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '2') }, /* XDCAM HD 1080i60 */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '3') }, /* XDCAM HD 1080i50 VBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '4') }, /* XDCAM EX 720p24 VBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '5') }, /* XDCAM EX 720p25 VBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '6') }, /* XDCAM HD 1080p24 VBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '7') }, /* XDCAM HD 1080p25 VBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '8') }, /* XDCAM HD 1080p30 VBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '9') }, /* XDCAM EX 720p60 VBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'a') }, /* XDCAM EX 720p50 VBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'b') }, /* XDCAM EX 1080i60 VBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'c') }, /* XDCAM EX 1080i50 VBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'd') }, /* XDCAM EX 1080p24 VBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'e') }, /* XDCAM EX 1080p25 VBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'f') }, /* XDCAM EX 1080p30 VBR */
+- { CODEC_ID_MPEG2VIDEO, MKTAG('A', 'V', 'm', 'p') }, /* AVID IMX PAL */
+-
+- { CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */
+-
+- { CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') }, /* Truevision Targa */
+- { CODEC_ID_TIFF, MKTAG('t', 'i', 'f', 'f') }, /* TIFF embedded in MOV */
+- { CODEC_ID_GIF, MKTAG('g', 'i', 'f', ' ') }, /* embedded gif files as frames (usually one "click to play movie" frame) */
+- { CODEC_ID_PNG, MKTAG('p', 'n', 'g', ' ') },
+-
+- { CODEC_ID_VC1, MKTAG('v', 'c', '-', '1') }, /* SMPTE RP 2025 */
+- { CODEC_ID_CAVS, MKTAG('a', 'v', 's', '2') },
+-
+- { CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') },
+- { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */
+-// { CODEC_ID_FLV1, MKTAG('H', '2', '6', '3') }, /* Flash Media Server */
+- { CODEC_ID_MSMPEG4V3, MKTAG('3', 'I', 'V', 'D') }, /* 3ivx DivX Doctor */
+- { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', '1', 'x') }, /* AVID 1:1x */
+- { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'u', 'p') },
+- { CODEC_ID_SGI, MKTAG('s', 'g', 'i', ' ') }, /* SGI */
+- { CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') }, /* DPX */
+-
+- { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'h') }, /* Apple ProRes 422 High Quality */
+- { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'n') }, /* Apple ProRes 422 Standard Definition */
+- { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 's') }, /* Apple ProRes 422 LT */
+- { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'o') }, /* Apple ProRes 422 Proxy */
+- { CODEC_ID_PRORES, MKTAG('a', 'p', '4', 'h') }, /* Apple ProRes 4444 */
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('r', 'a', 'w', ' ') }, /* Uncompressed RGB */
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', '2') }, /* Uncompressed YUV422 */
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'U', 'I') }, /* YUV with alpha-channel (AVID Uncompressed) */
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* UNCOMPRESSED 8BIT 4:2:2 */
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2vuy but byte swapped */
++
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('L', '5', '5', '5') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('L', '5', '6', '5') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '5', '6', '5') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('2', '4', 'B', 'G') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('b', '1', '6', 'g') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('b', '4', '8', 'r') },
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */
++
++ { AV_CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') }, /* UNCOMPRESSED 10BIT RGB */
++ { AV_CODEC_ID_R10K, MKTAG('R', '1', '0', 'g') }, /* UNCOMPRESSED 10BIT RGB */
++ { AV_CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, /* UNCOMPRESSED 10BIT RGB */
++ { AV_CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */
++
++ { AV_CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */
++ { AV_CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */
++ { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'D', 'J') }, /* MJPEG with alpha-channel (AVID JFIF meridien compressed) */
++/* { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, *//* MJPEG with alpha-channel (AVID ABVB/Truevision NuVista) */
++ { AV_CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, /* Motion JPEG OpenDML */
++ { AV_CODEC_ID_MJPEGB, MKTAG('m', 'j', 'p', 'b') }, /* Motion-JPEG (format B) */
++
++ { AV_CODEC_ID_SVQ1, MKTAG('S', 'V', 'Q', '1') }, /* Sorenson Video v1 */
++ { AV_CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, /* Sorenson Video v1 */
++ { AV_CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', 'i') }, /* Sorenson Video v1 (from QT specs)*/
++ { AV_CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, /* Sorenson Video v3 */
++
++ { AV_CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
++ { AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, /* OpenDiVX *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */
++ { AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') },
++ { AV_CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, /* experimental: 3IVX files before ivx D4 4.5.1 */
++
++ { AV_CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, /* H263 */
++ { AV_CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, /* H263 ?? works */
++
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'p', 'p') }, /* DVCPRO PAL produced by FCP */
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'p') }, /* DVCPRO50 PAL produced by FCP */
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'n') }, /* DVCPRO50 NTSC produced by FCP */
++ { AV_CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, /* AVID DV */
++ { AV_CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', '1') }, /* AVID DV100 */
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'q') }, /* DVCPRO HD 720p50 */
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'p') }, /* DVCPRO HD 720p60 */
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') },
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '2') },
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '4') },
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '5') }, /* DVCPRO HD 50i produced by FCP */
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '6') }, /* DVCPRO HD 60i produced by FCP */
++ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '3') }, /* DVCPRO HD 30p produced by FCP */
++
++ { AV_CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, /* On2 VP3 */
++ { AV_CODEC_ID_RPZA, MKTAG('r', 'p', 'z', 'a') }, /* Apple Video (RPZA) */
++ { AV_CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, /* Cinepak */
++ { AV_CODEC_ID_8BPS, MKTAG('8', 'B', 'P', 'S') }, /* Planar RGB (8BPS) */
++ { AV_CODEC_ID_SMC, MKTAG('s', 'm', 'c', ' ') }, /* Apple Graphics (SMC) */
++ { AV_CODEC_ID_QTRLE, MKTAG('r', 'l', 'e', ' ') }, /* Apple Animation (RLE) */
++ { AV_CODEC_ID_MSRLE, MKTAG('W', 'R', 'L', 'E') },
++ { AV_CODEC_ID_QDRAW, MKTAG('q', 'd', 'r', 'w') }, /* QuickDraw */
++
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('W', 'R', 'A', 'W') },
++
++ { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */
++ { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', 'p') }, /* AVC-Intra 50M 720p24/30/60 */
++ { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', 'q') }, /* AVC-Intra 50M 720p25/50 */
++ { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', '2') }, /* AVC-Intra 50M 1080p25/50 */
++ { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', '3') }, /* AVC-Intra 50M 1080p24/30/60 */
++ { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', '5') }, /* AVC-Intra 50M 1080i50 */
++ { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', '6') }, /* AVC-Intra 50M 1080i60 */
++ { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', 'p') }, /* AVC-Intra 100M 720p24/30/60 */
++ { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', 'q') }, /* AVC-Intra 100M 720p25/50 */
++ { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '2') }, /* AVC-Intra 100M 1080p25/50 */
++ { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '3') }, /* AVC-Intra 100M 1080p24/30/60 */
++ { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '5') }, /* AVC-Intra 100M 1080i50 */
++ { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '6') }, /* AVC-Intra 100M 1080i60 */
++
++ { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */
++ { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */
++ { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', ' ') },
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '1') }, /* Apple MPEG-2 Camcorder */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* MPEG2 HDV 1080i50 */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '5') }, /* MPEG2 HDV 720p25 */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '6') }, /* MPEG2 HDV 1080p24 */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '7') }, /* MPEG2 HDV 1080p25 */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '8') }, /* MPEG2 HDV 1080p30 */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'n') }, /* MPEG2 IMX NTSC 525/60 50mb/s produced by FCP */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'p') }, /* MPEG2 IMX PAL 625/50 50mb/s produced by FCP */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'n') }, /* MPEG2 IMX NTSC 525/60 40mb/s produced by FCP */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'p') }, /* MPEG2 IMX PAL 625/50 40mb/s produced by FCP */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'n') }, /* MPEG2 IMX NTSC 525/60 30mb/s produced by FCP */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'p') }, /* MPEG2 IMX PAL 625/50 30mb/s produced by FCP */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '4') }, /* XDCAM HD422 720p24 CBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '5') }, /* XDCAM HD422 720p25 CBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '9') }, /* XDCAM HD422 720p60 CBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'a') }, /* XDCAM HD422 720p50 CBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'b') }, /* XDCAM HD422 1080i60 CBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'c') }, /* XDCAM HD422 1080i50 CBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'd') }, /* XDCAM HD422 1080p24 CBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'e') }, /* XDCAM HD422 1080p25 CBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'f') }, /* XDCAM HD422 1080p30 CBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '1') }, /* XDCAM EX 720p30 VBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '2') }, /* XDCAM HD 1080i60 */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '3') }, /* XDCAM HD 1080i50 VBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '4') }, /* XDCAM EX 720p24 VBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '5') }, /* XDCAM EX 720p25 VBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '6') }, /* XDCAM HD 1080p24 VBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '7') }, /* XDCAM HD 1080p25 VBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '8') }, /* XDCAM HD 1080p30 VBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '9') }, /* XDCAM EX 720p60 VBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'a') }, /* XDCAM EX 720p50 VBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'b') }, /* XDCAM EX 1080i60 VBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'c') }, /* XDCAM EX 1080i50 VBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'd') }, /* XDCAM EX 1080p24 VBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'e') }, /* XDCAM EX 1080p25 VBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'f') }, /* XDCAM EX 1080p30 VBR */
++ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('A', 'V', 'm', 'p') }, /* AVID IMX PAL */
++
++ { AV_CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */
++
++ { AV_CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') }, /* Truevision Targa */
++ { AV_CODEC_ID_TIFF, MKTAG('t', 'i', 'f', 'f') }, /* TIFF embedded in MOV */
++ { AV_CODEC_ID_GIF, MKTAG('g', 'i', 'f', ' ') }, /* embedded gif files as frames (usually one "click to play movie" frame) */
++ { AV_CODEC_ID_PNG, MKTAG('p', 'n', 'g', ' ') },
++
++ { AV_CODEC_ID_VC1, MKTAG('v', 'c', '-', '1') }, /* SMPTE RP 2025 */
++ { AV_CODEC_ID_CAVS, MKTAG('a', 'v', 's', '2') },
++
++ { AV_CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') },
++ { AV_CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */
++// { AV_CODEC_ID_FLV1, MKTAG('H', '2', '6', '3') }, /* Flash Media Server */
++ { AV_CODEC_ID_MSMPEG4V3, MKTAG('3', 'I', 'V', 'D') }, /* 3ivx DivX Doctor */
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'V', '1', 'x') }, /* AVID 1:1x */
++ { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'u', 'p') },
++ { AV_CODEC_ID_SGI, MKTAG('s', 'g', 'i', ' ') }, /* SGI */
++ { AV_CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') }, /* DPX */
++
++ { AV_CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'h') }, /* Apple ProRes 422 High Quality */
++ { AV_CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'n') }, /* Apple ProRes 422 Standard Definition */
++ { AV_CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 's') }, /* Apple ProRes 422 LT */
++ { AV_CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'o') }, /* Apple ProRes 422 Proxy */
++ { AV_CODEC_ID_PRORES, MKTAG('a', 'p', '4', 'h') }, /* Apple ProRes 4444 */
+
+- { CODEC_ID_NONE, 0 },
++ { AV_CODEC_ID_NONE, 0 },
+ };
+
+ ///////////////////////////////////////////////
+--- lives-2.2.2~ds0.orig/lives-plugins/plugins/decoders/mpegts_decoder.c
++++ lives-2.2.2~ds0/lives-plugins/plugins/decoders/mpegts_decoder.c
+@@ -112,9 +112,13 @@ const char *plugin_version="LiVES mpegts
+ #define av_new_stream(a, b) avformat_new_stream(a, NULL)
+ #endif
+
+-#if HAVE_AVPRIV_SET_PTS_INFO
+-#define av_set_pts_info(a,b,c,d) avpriv_set_pts_info(a,b,c,d)
+-#endif
++#define av_set_pts_info(s, p_wrap_bits, pts_num, pts_den) \
++ do { \
++ AVRational new_tb; \
++ av_reduce(&new_tb.num, &new_tb.den, pts_num, pts_den, INT_MAX); \
++ s->time_base = new_tb; \
++ s->pts_wrap_bits = p_wrap_bits; \
++ } while (0);
+
+
+
+@@ -958,7 +962,7 @@ static const StreamType HDMV_types[] = {
+ { 0x86, AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS }, /* DTS HD MASTER*/
+ { 0xa1, AVMEDIA_TYPE_AUDIO, CODEC_ID_EAC3 }, /* E-AC3 Secondary Audio */
+ { 0xa2, AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS }, /* DTS Express Secondary Audio */
+- { 0x90, AVMEDIA_TYPE_SUBTITLE, CODEC_ID_HDMV_PGS_SUBTITLE },
++ { 0x90, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_HDMV_PGS_SUBTITLE },
+ { 0 },
+ };
+
+@@ -1762,19 +1766,19 @@ static void m4sl_cb(lives_clip_data_t *c
+
+ ff_mp4_read_dec_config_descr(cdata, s, st, mp4_descr[i].dec_config_descr);
+
+- if (st->codec->codec_id == CODEC_ID_AAC &&
++ if (st->codec->codec_id == AV_CODEC_ID_AAC &&
+ st->codec->extradata_size > 0)
+ st->need_parsing = 0;
+- if (st->codec->codec_id == CODEC_ID_H264 &&
++ if (st->codec->codec_id == AV_CODEC_ID_H264 &&
+ st->codec->extradata_size > 0)
+ st->need_parsing = 0;
+
+- if (st->codec->codec_id <= CODEC_ID_NONE) {
+- } else if (st->codec->codec_id < CODEC_ID_FIRST_AUDIO) {
++ if (st->codec->codec_id <= AV_CODEC_ID_NONE) {
++ } else if (st->codec->codec_id < AV_CODEC_ID_FIRST_AUDIO) {
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+- } else if (st->codec->codec_id < CODEC_ID_FIRST_SUBTITLE) {
++ } else if (st->codec->codec_id < AV_CODEC_ID_FIRST_SUBTITLE) {
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+- } else if (st->codec->codec_id < CODEC_ID_FIRST_UNKNOWN) {
++ } else if (st->codec->codec_id < AV_CODEC_ID_FIRST_UNKNOWN) {
+ st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
+ }
+ }
+@@ -1808,7 +1812,7 @@ int ff_parse_mpeg2_descriptor(lives_clip
+
+ //fprintf(stderr, "tag: 0x%02x len=%d\n", desc_tag, desc_len);
+
+- if (st->codec->codec_id == CODEC_ID_NONE &&
++ if (st->codec->codec_id == AV_CODEC_ID_NONE &&
+ stream_type == STREAM_TYPE_PRIVATE_DATA)
+ mpegts_find_stream_type(st, desc_tag, DESC_types);
+
+@@ -1823,19 +1827,19 @@ int ff_parse_mpeg2_descriptor(lives_clip
+
+ ff_mp4_read_dec_config_descr(cdata, fc, st, mp4_descr[i].dec_config_descr);
+
+- if (st->codec->codec_id == CODEC_ID_AAC &&
++ if (st->codec->codec_id == AV_CODEC_ID_AAC &&
+ st->codec->extradata_size > 0)
+ st->need_parsing = 0;
+- if (st->codec->codec_id == CODEC_ID_MPEG4SYSTEMS)
++ if (st->codec->codec_id == AV_CODEC_ID_MPEG4SYSTEMS)
+ mpegts_open_section_filter(ts, pid, m4sl_cb, ts, 1);
+ }
+ break;
+ case 0x1F: /* FMC descriptor */
+ get16(pp, desc_end);
+- if (mp4_descr_count > 0 && (st->codec->codec_id == CODEC_ID_AAC_LATM) &&
++ if (mp4_descr_count > 0 && (st->codec->codec_id == AV_CODEC_ID_AAC_LATM) &&
+ mp4_descr->dec_config_descr_len && mp4_descr->es_id == pid) {
+ ff_mp4_read_dec_config_descr(cdata, fc, st, mp4_descr->dec_config_descr);
+- if (st->codec->codec_id == CODEC_ID_AAC &&
++ if (st->codec->codec_id == AV_CODEC_ID_AAC &&
+ st->codec->extradata_size > 0){
+ st->need_parsing = 0;
+ st->codec->codec_type= AVMEDIA_TYPE_AUDIO;
+@@ -1899,7 +1903,7 @@ int ff_parse_mpeg2_descriptor(lives_clip
+ st->codec->codec_tag = lives_rl32((const char *)*pp);
+ *pp+=4;
+ //av_dlog(fc, "reg_desc=%.4s\n", (char*)&st->codec->codec_tag);
+- if (st->codec->codec_id == CODEC_ID_NONE &&
++ if (st->codec->codec_id == AV_CODEC_ID_NONE &&
+ stream_type == STREAM_TYPE_PRIVATE_DATA)
+ mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types);
+ break;
+@@ -2588,7 +2592,7 @@ static int lives_mpegts_read_header(live
+ goto fail;
+ av_set_pts_info(st, 60, 1, 27000000);
+ st->codec->codec_type = AVMEDIA_TYPE_DATA;
+- st->codec->codec_id = CODEC_ID_MPEG2TS;
++ st->codec->codec_id = AV_CODEC_ID_MPEG2TS;
+
+ if (priv->vidst==NULL) {
+ priv->vidst=st;
+@@ -2730,7 +2734,7 @@ void ff_read_frame_flush(AVFormatContext
+ st->last_IP_pts = AV_NOPTS_VALUE;
+ if(st->first_dts == AV_NOPTS_VALUE) st->cur_dts = 0;
+ else st->cur_dts = AV_NOPTS_VALUE; /* we set the current DTS to an unspecified origin */
+- st->reference_dts = AV_NOPTS_VALUE;
++ /* st->reference_dts = AV_NOPTS_VALUE; */
+ /* fail safe */
+ //st->cur_ptr = NULL;
+ //st->cur_len = 0;
+@@ -3223,12 +3227,12 @@ static boolean attach_stream(lives_clip_
+ cdata->offs_y=0;
+
+ switch (priv->vidst->codec->codec_id) {
+- case CODEC_ID_DIRAC: sprintf(cdata->video_name,"%s","dirac"); break;
+- case CODEC_ID_H264: sprintf(cdata->video_name,"%s","h264"); break;
+- case CODEC_ID_MPEG1VIDEO: sprintf(cdata->video_name,"%s","mpeg1"); break;
+- case CODEC_ID_MPEG2VIDEO: sprintf(cdata->video_name,"%s","mpeg2"); break;
+- case CODEC_ID_MPEG4: sprintf(cdata->video_name,"%s","mpeg2"); break;
+- case CODEC_ID_VC1: sprintf(cdata->video_name,"%s","vc1"); break;
++ case AV_CODEC_ID_DIRAC: sprintf(cdata->video_name,"%s","dirac"); break;
++ case AV_CODEC_ID_H264: sprintf(cdata->video_name,"%s","h264"); break;
++ case AV_CODEC_ID_MPEG1VIDEO: sprintf(cdata->video_name,"%s","mpeg1"); break;
++ case AV_CODEC_ID_MPEG2VIDEO: sprintf(cdata->video_name,"%s","mpeg2"); break;
++ case AV_CODEC_ID_MPEG4: sprintf(cdata->video_name,"%s","mpeg2"); break;
++ case AV_CODEC_ID_VC1: sprintf(cdata->video_name,"%s","vc1"); break;
+ default: sprintf(cdata->video_name,"%s","unknown"); break;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 0571854..b9ff081 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
02-drop_py3_multiencoder.patch
99-workaround_av_find_stream_info.patch
99-reload_osc.patch
+libav10.patch
--
lives packaging
More information about the pkg-multimedia-commits
mailing list