highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mxfdec: Fix mixed declaration and code

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-10-21 19:34:05 +02:00
parent a92f8edf0c
commit c495f4ffde
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/mxfdec.c
View File

@@ -1861,8 +1861,9 @@ static int mxf_add_metadata_stream(MXFContext *mxf, MXFTrack *track)
const MXFCodecUL *codec_ul = NULL; const MXFCodecUL *codec_ul = NULL;
MXFPackage tmp_package; MXFPackage tmp_package;
AVStream *st; AVStream *st;
int j;
for (int j = 0; j < track->sequence->structural_components_count; j++) { for (j = 0; j < track->sequence->structural_components_count; j++) {
component = mxf_resolve_sourceclip(mxf, &track->sequence->structural_components_refs[j]); component = mxf_resolve_sourceclip(mxf, &track->sequence->structural_components_refs[j]);
if (!component) if (!component)
continue; continue;
@@ -2668,10 +2669,12 @@ static int is_pcm(enum AVCodecID codec_id)
static AVStream* mxf_get_opatom_stream(MXFContext *mxf) static AVStream* mxf_get_opatom_stream(MXFContext *mxf)
{ {
int i;
if (mxf->op != OPAtom) if (mxf->op != OPAtom)
return NULL; return NULL;
for (int i = 0; i < mxf->fc->nb_streams; i++) { for (i = 0; i < mxf->fc->nb_streams; i++) {
if (mxf->fc->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_DATA) if (mxf->fc->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_DATA)
continue; continue;
return mxf->fc->streams[i]; return mxf->fc->streams[i];