OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2ed7e35
)
Support H264 from QNAP Systems.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sat, 15 Oct 2011 16:28:32 +0000
(18:28 +0200)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sat, 15 Oct 2011 16:28:32 +0000
(18:28 +0200)
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index
a6cf8b4
..
e41b5bf
100644
(file)
--- 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') },