[FFmpeg-cvslog] Support H264 from QNAP Systems.

Carl Eugen Hoyos git at videolan.org
Sat Oct 15 18:28:59 CEST 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Oct 15 18:28:32 2011 +0200| [5a563c63196659005c82d79d355fba3fa2755844] | committer: Carl Eugen Hoyos

Support H264 from QNAP Systems.

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

 libavformat/riff.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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



More information about the ffmpeg-cvslog mailing list