diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-09-02 12:02:03 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-09-02 12:02:03 +0200 |
| commit | 3668168afa1ef73928b2c6cc2a6ffa8e8ad82312 (patch) | |
| tree | 9e6db5a27833aa03d176feb84082f90ed291c801 /libavformat | |
| parent | 58e0402e02ae5e466c33b9465c1465fdee68d342 (diff) | |
| download | ffmpeg-3668168afa1ef73928b2c6cc2a6ffa8e8ad82312.tar.gz | |
Support decoding of ImageJ png in avi.
Fixes ticket #3916.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/riff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 735dea0eaf..053038ba04 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -321,6 +321,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') }, |