[FFmpeg-cvslog] Support decoding ASP variant from QNAP Systems.

Carl Eugen Hoyos git at videolan.org
Sun Oct 16 10:33:56 CEST 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Oct 16 10:30:24 2011 +0200| [55d44578c61ccd8b7db50e26e01196476ea530f3] | committer: Carl Eugen Hoyos

Support decoding ASP variant from QNAP Systems.

Fixes part of ticket #560.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55d44578c61ccd8b7db50e26e01196476ea530f3
---

 libavformat/riff.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavformat/riff.c b/libavformat/riff.c
index e41b5bf..e3fd639 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') },



More information about the ffmpeg-cvslog mailing list