From 7686ab07acd10595664cc90455c254efb9fb63b7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 5 Jun 2010 23:13:52 +0000 Subject: [PATCH] Fix muxing rgb rawvideo in avi regression. Originally committed as revision 23500 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index 3f14ad8c13..6365f3e33e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -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]; -- 2.11.0