Mercurial > libavformat.hg

changeset 6097:2f4b67897701 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix muxing rgb rawvideo in avi regression.
author michael
date Sat, 05 Jun 2010 23:13:52 +0000
parents 7c2221a89902
children 47759a2966f6
files utils.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/utils.c	Sat Jun 05 19:49:55 2010 +0000
+++ b/utils.c	Sat Jun 05 23:13:52 2010 +0000
@@ -2654,6 +2654,10 @@
         }
 
         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];