summaryrefslogtreecommitdiff
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-10-16 10:30:24 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-10-16 10:30:24 +0200
commit55d44578c61ccd8b7db50e26e01196476ea530f3 (patch)
tree53b0ef5537bc9982174cb450918aa7d21c533f71 /libavformat/riff.c
parent2eaa55375bca0d502d817fa86639af03c7fcaf89 (diff)
Support decoding ASP variant from QNAP Systems.
Fixes part of ticket #560.
Diffstat (limited to 'libavformat/riff.c')
-rw-r--r--libavformat/riff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index e41b5bfb2b..e3fd639b9c 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -89,6 +89,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */
{ CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'X') },
{ CODEC_ID_MPEG4, MKTAG('D', 'r', 'e', 'X') },
+ { CODEC_ID_MPEG4, MKTAG('Q', 'M', 'P', '4') }, /* QNAP Systems */
{ CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
{ CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') },
{ CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') },