diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-12 14:03:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-12 14:03:54 +0200 |
| commit | 23c8a3353bd948f4a69116124dc433c85909d86e (patch) | |
| tree | 4d992f5ed5291216815f8289fd4d7c093eb3c73b | |
| parent | aeddc6e3a552d094dfb890dd1f017421816e367b (diff) | |
| parent | a52b5a5a07b0d432f9bed90b6d56647f8d44fbce (diff) | |
| download | ffmpeg-23c8a3353bd948f4a69116124dc433c85909d86e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
riff: Add a mapping for VP6A
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 a0e3ea58cd..f084b363e8 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -251,6 +251,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') }, { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') }, { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') }, + { AV_CODEC_ID_VP6A, MKTAG('V', 'P', '6', 'A') }, { AV_CODEC_ID_VP6F, MKTAG('V', 'P', '6', 'F') }, { AV_CODEC_ID_VP6F, MKTAG('F', 'L', 'V', '4') }, { AV_CODEC_ID_VP8, MKTAG('V', 'P', '8', '0') }, |