Commit 48855b26 authored by Baptiste Coudurier's avatar Baptiste Coudurier

do not overwrite codec type if already known, fix conflict between 'raw '...

do not overwrite codec type if already known, fix conflict between 'raw ' fourcc used for audio and video, ae002_wordup.mov

Originally committed as revision 6890 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f5a9e8f3
......@@ -803,9 +803,10 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
st->codec->codec_tag = format;
id = codec_get_id(mov_audio_tags, format);
if (id > 0) {
if (st->codec->codec_type != CODEC_TYPE_VIDEO && id > 0) {
st->codec->codec_type = CODEC_TYPE_AUDIO;
} else if (format && format != MKTAG('m', 'p', '4', 's')) { /* skip old asf mpeg4 tag */
} else if (st->codec->codec_type != CODEC_TYPE_AUDIO && /* do not overwrite codec type */
format && format != MKTAG('m', 'p', '4', 's')) { /* skip old asf mpeg4 tag */
id = codec_get_id(mov_video_tags, format);
if (id <= 0)
id = codec_get_id(codec_bmp_tags, format);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment