aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-10-15 18:28:32 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-10-15 18:28:32 +0200
commit5a563c63196659005c82d79d355fba3fa2755844 (patch)
treec6842f6f2577a445fbdffaa546ef1e0c43194b20
parent2ed7e353bd8867215bc156c430d4ded7f6774ad4 (diff)
downloadffmpeg-5a563c63196659005c82d79d355fba3fa2755844.tar.gz
Support H264 from QNAP Systems.
-rw-r--r--libavformat/riff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index a6cf8b4197..e41b5bfb2b 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -36,6 +36,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') },
{ CODEC_ID_H264, MKTAG('D', 'A', 'V', 'C') },
{ CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') },
+ { CODEC_ID_H264, MKTAG('Q', '2', '6', '4') }, /* QNAP surveillance system */
{ CODEC_ID_H263, MKTAG('H', '2', '6', '3') },
{ CODEC_ID_H263, MKTAG('X', '2', '6', '3') },
{ CODEC_ID_H263, MKTAG('T', '2', '6', '3') },