[FFmpeg-cvslog] riff: add H264 from QNAP Systems

Carl Eugen Hoyos git at videolan.org
Fri Apr 4 03:25:00 CEST 2014


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Apr  3 12:00:05 2014 +0200| [51ace0fb921e7dcdf4879068fd474c61e9e506a9] | committer: Vittorio Giovara

riff: add H264 from QNAP Systems

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

 libavformat/riff.c |    1 +
 1 file changed, 1 insertion(+)

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



More information about the ffmpeg-cvslog mailing list