diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2014-03-03 21:54:26 +0100 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2014-03-19 11:51:08 +0100 |
commit | 92ebb332157195b7c1212e734c5668afbf19cf2b (patch) | |
tree | a6ea63d26741caf9aef4ac965b4d2467ac824b4a /libavformat/mxf.c | |
parent | dbd12523a407824a8ccbb9246a908f3ebb4b3376 (diff) | |
download | ffmpeg-92ebb332157195b7c1212e734c5668afbf19cf2b.tar.gz |
mxf: Add additional H264 PictureEssenceCoding
Unbreak some MXF Proxy files.
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 01018d35f2..8f09c611fa 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -45,6 +45,7 @@ const MXFCodecUL ff_mxf_codec_uls[] = { { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x71,0x00,0x00,0x00 }, 13, AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x02,0x00,0x00 }, 14, AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */ { { 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,0x00 }, 15, AV_CODEC_ID_V210 }, /* V210 */ /* SoundEssenceCompression */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, 13, AV_CODEC_ID_PCM_S16LE }, /* Uncompressed */ |