diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-04-03 12:57:16 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-04-04 01:29:23 +0200 |
| commit | f5f18aecef277030e38e9107be310f744d12a4f8 (patch) | |
| tree | 1c2c2d2426d10058d42d4535d4812243fbd8e860 /libavformat/riff.c | |
| parent | ade32b4a84000b4f0833f5bfaede5595e01bcc8f (diff) | |
| download | ffmpeg-f5f18aecef277030e38e9107be310f744d12a4f8.tar.gz | |
riff: Support decoding ASP variant from QNAP Systems
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 a60d750c0f..b68abce118 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') }, |