[FFmpeg-cvslog] r23500 - trunk/libavformat/utils.c

[michael]

Author: michael
Date: Sun Jun  6 01:13:52 2010
New Revision: 23500

Log:
Fix muxing rgb rawvideo in avi regression.

Modified:
   trunk/libavformat/utils.c

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	Sat Jun  5 22:58:56 2010	(r23499)
+++ trunk/libavformat/utils.c	Sun Jun  6 01:13:52 2010	(r23500)
@@ -2654,6 +2654,10 @@ int av_write_header(AVFormatContext *s)
         }
 
         if(s->oformat->codec_tag){
+            if(st->codec->codec_tag && st->codec->codec_id == CODEC_ID_RAWVIDEO && av_codec_get_tag(s->oformat->codec_tag, st->codec->codec_id) == 0 && !validate_codec_tag(s, st)){
+                //the current rawvideo encoding system ends up setting the wrong codec_tag for avi, we override it here
+                st->codec->codec_tag= 0;
+            }
             if(st->codec->codec_tag){
                 if (!validate_codec_tag(s, st)) {
                     char tagbuf[32];