diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-03-04 23:48:41 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-03-04 23:48:41 +0100 |
| commit | 63c9b6e431b8eaa027dfabc0518841fb800b34ef (patch) | |
| tree | 17667079da58298f8946c464bfa681fb7a2b9341 /libavformat/mxf.c | |
| parent | 4ad7b8f64a243f7a6df049fe29dbc7667730c6e1 (diff) | |
| download | ffmpeg-63c9b6e431b8eaa027dfabc0518841fb800b34ef.tar.gz | |
lavf/mxf: Support ProRes decoding.
Fixes ticket #4349.
Diffstat (limited to 'libavformat/mxf.c')
| -rw-r--r-- | libavformat/mxf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/mxf.c b/libavformat/mxf.c index 14d143e5f0..61b37f84ef 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 */ |