RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-01 10:11:01 +00:00
Code Issues Projects Releases Wiki Activity

avformat/mxfdec: use first valid sourceclip found if material track has multiple components

Browse Source 
This commit fixes a issue with mxf footage having multiple
components on a material track.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Mark Reid 2016-09-18 14:11:34 -07:00 committed by Michael Niedermayer
parent fa0780d644
commit d8d4333217
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/mxfdec.c
View File

@ -1888,7 +1888,11 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
} }
} }
/* TODO: handle multiple source clips */ /* TODO: handle multiple source clips, only finds first valid source clip */
if(material_track->sequence->structural_components_count > 1)
av_log(mxf->fc, AV_LOG_WARNING, "material track %d: has %d components\n",
material_track->track_id, material_track->sequence->structural_components_count);
for (j = 0; j < material_track->sequence->structural_components_count; j++) { for (j = 0; j < material_track->sequence->structural_components_count; j++) {
component = mxf_resolve_sourceclip(mxf, &material_track->sequence->structural_components_refs[j]); component = mxf_resolve_sourceclip(mxf, &material_track->sequence->structural_components_refs[j]);
if (!component) if (!component)
@ -1914,6 +1918,8 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
av_log(mxf->fc, AV_LOG_ERROR, "material track %d: no corresponding source track found\n", material_track->track_id); av_log(mxf->fc, AV_LOG_ERROR, "material track %d: no corresponding source track found\n", material_track->track_id);
break; break;
} }
if(source_track && component)
break;
} }
if (!source_track || !component || !source_package) if (!source_track || !component || !source_package)
continue; continue;