From: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Fri, 3 Nov 2006 16:19:14 +0000 (+0000)
Subject: do not overwrite codec type if already known, fix conflict between 'raw ' fourcc... 
X-Git-Tag: v0.5~11194
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48855b26d4c8fb6876384961cbefaff84b8c055e;p=platform%2Fupstream%2Flibav.git

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
---

diff --git a/libavformat/mov.c b/libavformat/mov.c
index df4edc332..582d6221d 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);