[FFmpeg-cvslog] lavf/mxf: Support ProRes decoding.

Carl Eugen Hoyos git at videolan.org
Wed Mar 4 23:51:06 CET 2015


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Mar  4 23:48:41 2015 +0100| [63c9b6e431b8eaa027dfabc0518841fb800b34ef] | committer: Carl Eugen Hoyos

lavf/mxf: Support ProRes decoding.

Fixes ticket #4349.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=63c9b6e431b8eaa027dfabc0518841fb800b34ef
---

 libavformat/mxf.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index 14d143e..61b37f8 100644
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -50,6 +50,7 @@ const MXFCodecUL ff_mxf_codec_uls[] = {
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x00,0x00 }, 14,       AV_CODEC_ID_H264 }, /* H.264/MPEG-4 AVC Intra */
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x31,0x11,0x01 }, 14,       AV_CODEC_ID_H264 }, /* H.264/MPEG-4 AVC SPS/PPS in-band */
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x02,0x01 }, 16,       AV_CODEC_ID_V210 }, /* V210 */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0E,0x04,0x02,0x01,0x02,0x11,0x04,0x00 }, 15,     AV_CODEC_ID_PRORES }, /* PRORES */
     /* SoundEssenceCompression */
     { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x03,0x04,0x02,0x02,0x02,0x03,0x03,0x01,0x00 }, 14,        AV_CODEC_ID_AAC }, /* MPEG2 AAC ADTS (legacy) */
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, 13,  AV_CODEC_ID_PCM_S16LE }, /* Uncompressed */



More information about the ffmpeg-cvslog mailing list