projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a52a1bc
)
riff: add H264 from QNAP Systems
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Thu, 3 Apr 2014 10:00:05 +0000
(12:00 +0200)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Thu, 3 Apr 2014 23:29:21 +0000
(
01:29
+0200)
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index
6be00f3
..
4703176
100644
(file)
--- 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') },