[FFmpeg-cvslog] Support decoding of ImageJ png in avi.

Carl Eugen Hoyos git at videolan.org
Tue Sep 2 12:03:07 CEST 2014


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Sep  2 12:02:03 2014 +0200| [3668168afa1ef73928b2c6cc2a6ffa8e8ad82312] | committer: Carl Eugen Hoyos

Support decoding of ImageJ png in avi.

Fixes ticket #3916.

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

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

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 735dea0..053038b 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') },



More information about the ffmpeg-cvslog mailing list