virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

lavc/mxfdec: Support more mxf files with codec_ul.

Browse Source 
Fixes decoding for the sample from ticket #4820.
This commit is contained in:
Carl Eugen Hoyos 2015-09-04 23:50:34 +02:00
parent f253c34175
commit f7361dbcf4
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/mxfdec.c
View File

@ -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 }, { { 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[] = { static const char* const mxf_data_essence_descriptor[] = {
"vbi_vanc_smpte_436M", "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); codec_ul = mxf_get_codec_ul(ff_mxf_codec_uls, &descriptor->essence_codec_ul);
st->codec->codec_id = (enum AVCodecID)codec_ul->id; st->codec->codec_id = (enum AVCodecID)codec_ul->id;
if (st->codec->codec_id == AV_CODEC_ID_NONE) { 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; st->codec->codec_id = (enum AVCodecID)codec_ul->id;
} }