diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 20:39:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 20:39:05 +0100 |
| commit | bd9e0127c9fbfc18f1a663483d9388d69a1581f6 (patch) | |
| tree | 982ca15574c5bfe5614e615e67b723ed09c60774 /libavformat/mxf.c | |
| parent | dde16f5aaed327e15049b40a8dfae1f59647e4ec (diff) | |
| parent | 92ebb332157195b7c1212e734c5668afbf19cf2b (diff) | |
Merge commit '92ebb332157195b7c1212e734c5668afbf19cf2b'
* commit '92ebb332157195b7c1212e734c5668afbf19cf2b':
mxf: Add additional H264 PictureEssenceCoding
Conflicts:
libavformat/mxf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 be8a1d5fc4..d20ed946ac 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,0x01 }, 16, 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 */ |