diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 19:02:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 19:02:46 +0100 |
| commit | 0c4bf87b296145e38510655d1a14196493d5c54e (patch) | |
| tree | 63eb4722659980ba21abe4b72ab8a2f0e48f8a57 /libavformat/riff.c | |
| parent | b08f554fdc0886ab9815b2e3db3ae8a93baa57c8 (diff) | |
| parent | cde7df25ef74b85b5ce11d9171779f28f0c12d15 (diff) | |
| download | ffmpeg-0c4bf87b296145e38510655d1a14196493d5c54e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Mirillis FIC video decoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 5e01be7cf4..2ad9c9f67b 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -356,6 +356,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '2') }, { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '3') }, { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '4') }, + { AV_CODEC_ID_FIC, MKTAG('F', 'I', 'C', 'V') }, { AV_CODEC_ID_NONE, 0 } }; |