From c2e8805441d06f05d81582b839d29948d76472c8 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Thu, 3 Aug 2006 11:28:08 +0000 Subject: [PATCH] remove duplicate code Originally committed as revision 5906 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mxf.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libavformat/mxf.c b/libavformat/mxf.c index 54ccaea9f1..4c46277beb 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -812,25 +812,18 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) #endif /* TODO: drop PictureEssenceCoding and SoundEssenceCompression, only check EssenceContainer */ codec_ul = mxf_get_codec_ul(mxf_codec_uls, &descriptor->essence_codec_ul); + st->codec->codec_id = codec_ul->id; if (st->codec->codec_type == CODEC_TYPE_VIDEO) { - st->codec->codec_id = codec_ul->id; container_ul = mxf_get_codec_ul(mxf_picture_essence_container_uls, &descriptor->essence_container_ul); if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = container_ul->id; - if (container_ul->wrapping == Clip) { - dprintf("stream %d: clip wrapped picture essence\n", st->index); - st->need_parsing = 1; - } st->codec->width = descriptor->width; st->codec->height = descriptor->height; st->codec->bits_per_sample = descriptor->bits_per_sample; /* Uncompressed */ } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) { - st->codec->codec_id = codec_ul->id; container_ul = mxf_get_codec_ul(mxf_sound_essence_container_uls, &descriptor->essence_container_ul); if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = container_ul->id; - if (container_ul->wrapping == Clip) - st->need_parsing = 1; st->codec->channels = descriptor->channels; st->codec->bits_per_sample = descriptor->bits_per_sample; st->codec->sample_rate = descriptor->sample_rate.num / descriptor->sample_rate.den; @@ -847,6 +840,10 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) st->codec->codec_id = CODEC_ID_PCM_S32BE; } } + if (container_ul->wrapping == Clip) { + dprintf("stream %d: clip wrapped essence\n", st->index); + st->need_parsing = 1; + } } return 0; }