diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-21 19:34:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-21 20:06:29 +0200 |
| commit | c495f4ffde1eb452448dbe5818b33a2989c47bae (patch) | |
| tree | 187be3ea4511e183d5be59ea3984421a0e336305 /libavformat | |
| parent | a92f8edf0c51781e152651cce2e753ad6e359eb2 (diff) | |
| download | ffmpeg-c495f4ffde1eb452448dbe5818b33a2989c47bae.tar.gz | |
avformat/mxfdec: Fix mixed declaration and code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mxfdec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 656465b4d2..cdb5c4ed11 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1861,8 +1861,9 @@ static int mxf_add_metadata_stream(MXFContext *mxf, MXFTrack *track) const MXFCodecUL *codec_ul = NULL; MXFPackage tmp_package; 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]); if (!component) continue; @@ -2668,10 +2669,12 @@ static int is_pcm(enum AVCodecID codec_id) static AVStream* mxf_get_opatom_stream(MXFContext *mxf) { + int i; + if (mxf->op != OPAtom) 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) continue; return mxf->fc->streams[i]; |