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:
2eaa553
)
Support decoding ASP variant from QNAP Systems.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sun, 16 Oct 2011 08:30:24 +0000
(10:30 +0200)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sun, 16 Oct 2011 08:30:24 +0000
(10:30 +0200)
Fixes part of ticket #560.
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index
e41b5bf
..
e3fd639
100644
(file)
--- a/
libavformat/riff.c
+++ b/
libavformat/riff.c
@@
-89,6
+89,7
@@
const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */
{ CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'X') },
{ CODEC_ID_MPEG4, MKTAG('D', 'r', 'e', 'X') },
+ { CODEC_ID_MPEG4, MKTAG('Q', 'M', 'P', '4') }, /* QNAP Systems */
{ CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
{ CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') },
{ CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') },