diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-11-09 23:31:46 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-11-09 23:31:46 +0000 |
| commit | 4eff7cf42dbc39908cb529cdf2366b09b9ca3c1a (patch) | |
| tree | 437f3353a41c2c5b7c70bd983c58e7708da90c51 /libavformat | |
| parent | f6506a541aebfcb94c448925485b187c7e6cc7bd (diff) | |
| download | ffmpeg-4eff7cf42dbc39908cb529cdf2366b09b9ca3c1a.tar.gz | |
porting png support from -f image to -f image2
Originally committed as revision 3665 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/img2.c | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 3530cffdb3..f05a43a8e8 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -37,7 +37,7 @@ static const IdStrMap img_tags[] = { { 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 --git a/libavformat/utils.c b/libavformat/utils.c index 1699734bcd..9c07d5f445 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1739,6 +1739,7 @@ int av_find_stream_info(AVFormatContext *ic) 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); |