diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-11 16:53:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-11 16:53:22 +0200 |
| commit | 75a9479b393a02ffa03436f275ad2b91bd2acd26 (patch) | |
| tree | 2bd4ff21ce1fa15bab0bc7ad5eb59cd60319f77d /libavformat | |
| parent | 30fc71055616c2929e94915e983460629a0d27fa (diff) | |
lavf: extend the avi raw hack to mov
Fixes ticket1194
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 4e26a21b10..97fdd1c984 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3173,8 +3173,11 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options) } 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 + 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 || av_codec_get_tag(s->oformat->codec_tag, st->codec->codec_id) ==MKTAG('r', 'a', 'w', ' ')) + && !validate_codec_tag(s, st)){ + //the current rawvideo encoding system ends up setting the wrong codec_tag for avi/mov, we override it here st->codec->codec_tag= 0; } if(st->codec->codec_tag){ |