summaryrefslogtreecommitdiff
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-12-04 19:13:19 +0000
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-12-08 13:29:18 +0000
commit250e077ee9eec0176a6d54a78542dc792943e71a (patch)
treef12ba55a8a23a0c50012f15556fe2c87c52eec1c /libavformat/riff.c
parentb280c6202b28b371a8d96850194fd69d7ad5dcc0 (diff)
riff: Support decoding png in avi (ImageJ)
Diffstat (limited to 'libavformat/riff.c')
-rw-r--r--libavformat/riff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index b91f8f1bdf..776a25fc05 100644
--- 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') },