diff options
author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-04-03 12:00:05 +0200 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-04-04 01:29:21 +0200 |
commit | 51ace0fb921e7dcdf4879068fd474c61e9e506a9 (patch) | |
tree | c9a6701f5cfa507de7c0aaa9769f2fed310e882c /libavformat | |
parent | a52a1bc91274289d4edaf7f40b2d0c00151e1ef7 (diff) | |
download | ffmpeg-51ace0fb921e7dcdf4879068fd474c61e9e506a9.tar.gz |
riff: add H264 from QNAP Systems
Diffstat (limited to 'libavformat')
-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 6be00f30e1..47031769da 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -35,6 +35,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_H264, MKTAG('D', 'A', 'V', 'C') }, { AV_CODEC_ID_H264, MKTAG('S', 'M', 'V', '2') }, { AV_CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') }, + { AV_CODEC_ID_H264, MKTAG('Q', '2', '6', '4') }, /* QNAP surveillance system */ { AV_CODEC_ID_H263, MKTAG('H', '2', '6', '3') }, { AV_CODEC_ID_H263, MKTAG('X', '2', '6', '3') }, { AV_CODEC_ID_H263, MKTAG('T', '2', '6', '3') }, |