# HG changeset patch
# User bcoudurier
# Date 1162570754 0
# Node ID e8dc38807927bb25425b4a17e2eb64dff8aa93c6
# Parent  da1e7a00d3a21e86f39728b93497c3193e6d86db
do not overwrite codec type if already known, fix conflict between 'raw ' fourcc used for audio and video, ae002_wordup.mov

diff -r da1e7a00d3a2 -r e8dc38807927 mov.c
--- a/mov.c	Fri Nov 03 15:04:47 2006 +0000
+++ b/mov.c	Fri Nov 03 16:19:14 2006 +0000
@@ -803,9 +803,10 @@
 
         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);