diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-09-04 23:50:34 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-09-04 23:50:34 +0200 |
| commit | f7361dbcf482baa8cba1d3c5b9418244831d8971 (patch) | |
| tree | 58530370907a96947c1d63389b6e5a9b412acaec /libavformat | |
| parent | f253c341755e6e60c5dea38b6a5d0557bc1b15e4 (diff) | |
| download | ffmpeg-f7361dbcf482baa8cba1d3c5b9418244831d8971.tar.gz | |
lavc/mxfdec: Support more mxf files with codec_ul.
Fixes decoding for the sample from ticket #4820.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mxfdec.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 573497692e..82b5ef33d5 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1156,11 +1156,6 @@ static const MXFCodecUL mxf_data_essence_container_uls[] = { { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE }, }; -static const MXFCodecUL mxf_codec_uls[] = { - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, 14, AV_CODEC_ID_JPEG2000 }, - { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE }, -}; - static const char* const mxf_data_essence_descriptor[] = { "vbi_vanc_smpte_436M", }; @@ -1974,7 +1969,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) codec_ul = mxf_get_codec_ul(ff_mxf_codec_uls, &descriptor->essence_codec_ul); st->codec->codec_id = (enum AVCodecID)codec_ul->id; if (st->codec->codec_id == AV_CODEC_ID_NONE) { - codec_ul = mxf_get_codec_ul(mxf_codec_uls, &descriptor->codec_ul); + codec_ul = mxf_get_codec_ul(ff_mxf_codec_uls, &descriptor->codec_ul); st->codec->codec_id = (enum AVCodecID)codec_ul->id; } |