From 48855b26d4c8fb6876384961cbefaff84b8c055e Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Fri, 3 Nov 2006 16:19:14 +0000 Subject: [PATCH] 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 --- libavformat/mov.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index df4edc332b..582d6221d9 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -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);