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:
b280c62
)
riff: Support decoding png in avi (ImageJ)
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Thu, 4 Dec 2014 19:13:19 +0000
(19:13 +0000)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Mon, 8 Dec 2014 13:29:18 +0000
(13:29 +0000)
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index
b91f8f1
..
776a25f
100644
(file)
--- a/
libavformat/riff.c
+++ b/
libavformat/riff.c
@@
-314,6
+314,7
@@
const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') },
{ AV_CODEC_ID_PNG, MKTAG('M', 'P', 'N', 'G') },
{ AV_CODEC_ID_PNG, MKTAG('P', 'N', 'G', '1') },
+ { AV_CODEC_ID_PNG, MKTAG('p', 'n', 'g', ' ') }, /* ImageJ */
{ AV_CODEC_ID_CLJR, MKTAG('C', 'L', 'J', 'R') },
{ AV_CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') },
{ AV_CODEC_ID_RPZA, MKTAG('a', 'z', 'p', 'r') },