# HG changeset patch # User michael # Date 1100043106 0 # Node ID 03377d4de76ab427f14a6275537901c83d40bd3b # Parent 4f2b5cb90216e273d861f2979242aa2915a7d4d6 porting png support from -f image to -f image2 diff -r 4f2b5cb90216 -r 03377d4de76a img2.c --- a/img2.c Tue Nov 09 17:27:33 2004 +0000 +++ b/img2.c Tue Nov 09 23:31:46 2004 +0000 @@ -37,7 +37,7 @@ { CODEC_ID_MJPEG , "jpeg"}, { CODEC_ID_MJPEG , "jpg"}, { CODEC_ID_LJPEG , "ljpg"}, -// { CODEC_ID_PNG , "png"}, + { CODEC_ID_PNG , "png"}, { CODEC_ID_MPEG1VIDEO, "mpg1-img"}, { CODEC_ID_MPEG2VIDEO, "mpg2-img"}, { CODEC_ID_MPEG4 , "mpg4-img"}, diff -r 4f2b5cb90216 -r 03377d4de76a utils.c --- a/utils.c Tue Nov 09 17:27:33 2004 +0000 +++ b/utils.c Tue Nov 09 23:31:46 2004 +0000 @@ -1739,6 +1739,7 @@ st->codec.codec_id == CODEC_ID_H263 || st->codec.codec_id == CODEC_ID_VORBIS || st->codec.codec_id == CODEC_ID_MJPEG || + st->codec.codec_id == CODEC_ID_PNG || (st->codec.codec_id == CODEC_ID_MPEG4 && !st->need_parsing))) try_decode_frame(st, pkt->data, pkt->size);