diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2009-12-13 15:01:09 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2009-12-13 15:01:09 +0000 |
commit | 51ce8c2f874e0a2db5f9ae909bd11d9f697ba6c1 (patch) | |
tree | d572a232d0d3e220c7ba31b881373b8790b1404b | |
parent | e4637d6a60af0c414f8953826a51d77e5aee508f (diff) | |
download | ffmpeg-51ce8c2f874e0a2db5f9ae909bd11d9f697ba6c1.tar.gz |
Remove commented out code.
Originally committed as revision 20823 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavformat/utils.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index af9ec25566..98f391658a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2209,21 +2209,7 @@ int av_find_stream_info(AVFormatContext *ic) decompress the frame. We try to avoid that in most cases as it takes longer and uses more memory. For MPEG-4, we need to decompress for QuickTime. */ - if (!has_codec_parameters(st->codec) /*&& - (st->codec->codec_id == CODEC_ID_FLV1 || - st->codec->codec_id == CODEC_ID_H264 || - st->codec->codec_id == CODEC_ID_H263 || - st->codec->codec_id == CODEC_ID_H261 || - 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_PAM || - st->codec->codec_id == CODEC_ID_PGM || - st->codec->codec_id == CODEC_ID_PGMYUV || - st->codec->codec_id == CODEC_ID_PBM || - st->codec->codec_id == CODEC_ID_PPM || - st->codec->codec_id == CODEC_ID_SHORTEN || - (st->codec->codec_id == CODEC_ID_MPEG4 && !st->need_parsing))*/) + if (!has_codec_parameters(st->codec)) try_decode_frame(st, pkt); count++; |