virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Fix muxing rgb rawvideo in avi regression.

Browse Source 
Originally committed as revision 23500 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-06-05 23:13:52 +00:00
parent 538c0e13c7
commit 7686ab07ac
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/utils.c
View File

@ -2654,6 +2654,10 @@ int av_write_header(AVFormatContext *s)
} }
if(s->oformat->codec_tag){ 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(st->codec->codec_tag){
if (!validate_codec_tag(s, st)) { if (!validate_codec_tag(s, st)) {
char tagbuf[32]; char tagbuf[32];