diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-23 16:47:10 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-23 16:47:10 +0200 |
commit | 5271b857ebc7ddcfa2d0dc6604f55ef43d2bc49e (patch) | |
tree | 38b5f7b209f392584c6829a0dd1fd84a9b70bec1 /libavformat/riff.c | |
parent | cc0dc50d027b8aca27b07ef5cededde2e9d96d57 (diff) | |
parent | b4cfb8254eeeb2fc0aa2c0c36a5ede208af47a79 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dnxhddec: avoid a branch in 10-bit decode_dct_block()
H.264: Add optimizations to predict x86 assembly.
riff: Add mpgv MPEG-2 fourcc
add Flash Screen Video 2 decoder
Conflicts:
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
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 2e00ae8963..37c292e0cd 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -131,6 +131,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { CODEC_ID_MPEG2VIDEO, MKTAG('s', 'l', 'i', 'f') }, { CODEC_ID_MPEG2VIDEO, MKTAG('E', 'M', '2', 'V') }, { CODEC_ID_MPEG2VIDEO, MKTAG('M', '7', '0', '1') }, /* Matrox MPEG2 intra-only */ + { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', 'v') }, { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, |