[FFmpeg-cvslog] riff: Support decoding png in avi (ImageJ)

Carl Eugen Hoyos git at videolan.org
Mon Dec 8 20:46:07 CET 2014


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Dec  4 19:13:19 2014 +0000| [250e077ee9eec0176a6d54a78542dc792943e71a] | committer: Vittorio Giovara

riff: Support decoding png in avi (ImageJ)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=250e077ee9eec0176a6d54a78542dc792943e71a
---

 libavformat/riff.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/riff.c b/libavformat/riff.c
index b91f8f1..776a25f 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') },



More information about the ffmpeg-cvslog mailing list