mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
Fix muxing rgb rawvideo in avi regression.
Originally committed as revision 23500 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
538c0e13c7
commit
7686ab07ac
@ -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];
|
||||
|
Loading…
Reference in New Issue
Block a user