[SCM] libav/experimental: riff: Support decoding ASP variant from QNAP Systems

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f5f18aecef277030e38e9107be310f744d12a4f8
Author: Carl Eugen Hoyos <cehoyos at ag.or.at>
Date:   Thu Apr 3 12:57:16 2014 +0200

    riff: Support decoding ASP variant from QNAP Systems

diff --git a/libavformat/riff.c b/libavformat/riff.c
index a60d750..b68abce 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -105,6 +105,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { AV_CODEC_ID_MPEG4,        MKTAG('S', 'M', '4', 'V') },
     { AV_CODEC_ID_MPEG4,        MKTAG('X', 'V', 'I', 'X') },
     { AV_CODEC_ID_MPEG4,        MKTAG('D', 'r', 'e', 'X') },
+    { AV_CODEC_ID_MPEG4,        MKTAG('Q', 'M', 'P', '4') }, /* QNAP Systems */
     { AV_CODEC_ID_MSMPEG4V3,    MKTAG('M', 'P', '4', '3') },
     { AV_CODEC_ID_MSMPEG4V3,    MKTAG('D', 'I', 'V', '3') },
     { AV_CODEC_ID_MSMPEG4V3,    MKTAG('M', 'P', 'G', '3') },

-- 
Libav/FFmpeg packaging