diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-02 21:19:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-02 21:19:41 +0200 |
| commit | b286383bd2b13fdf59aecdb23d8514323460483b (patch) | |
| tree | 4f8ee9745d719e2918843d0d8ebcf053ac220ef4 /libavformat/riff.c | |
| parent | 7c84e7d33762a4bccc0002476a3b20e0b8f26fcc (diff) | |
| parent | 5e745cefc0f89cf698c4cf0104182472fe0f603e (diff) | |
| download | ffmpeg-b286383bd2b13fdf59aecdb23d8514323460483b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
asfdec: read attached pictures.
apetag: reindent
apetag: export attached covers as video streams.
apetag: fix the amount of data read from binary tags.
apetag: make sure avio_get_str() doesn't read more than it should.
mov: read itunes cover art.
snow: remove VLA in mc_block()
intfloat: Don't use designated initializers in the public headers
snow: remove a VLA.
doc: Remind devs to check return values, especially for malloc() et al
MS ATC Screen (aka MSS3) decoder
vf_yadif: move x86 init code to x86/yadif.c
vf_gradfun: move x86 init code to x86/gradfun.c
roqvideo: Remove a totally unused dspcontext
smacker: remove some unused code
dsicin: remove dead assignment
aacdec: remove dead assignment
rl2: remove dead assignment
proresenc: make a variable local to the loop where it is used
alsdec: remove dead assignments
Conflicts:
Changelog
doc/developer.texi
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavfilter/gradfun.h
libavfilter/x86/gradfun.c
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 7c91b427d6..a9715b5186 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -308,6 +308,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { CODEC_ID_FLIC, MKTAG('A', 'F', 'L', 'C') }, { CODEC_ID_EXR, MKTAG('e', 'x', 'r', ' ') }, { CODEC_ID_MSS1, MKTAG('M', 'S', 'S', '1') }, + { CODEC_ID_MSA1, MKTAG('M', 'S', 'A', '1') }, { CODEC_ID_NONE, 0 } }; |