From b60de406a4c109c1369eb573719c1f2f4ab9cd4a Mon Sep 17 00:00:00 2001 From: Maksym Veremeyenko Date: Wed, 9 Sep 2009 16:25:12 +0000 Subject: [PATCH] Factorise st->nb_index_entries check. Patch by Maksym Veremeyenko, verem m1stereo tv Originally committed as revision 19797 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avidec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 2175374e6e..0881ca5173 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -680,12 +680,15 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) AVIStream *ast = st->priv_data; int64_t ts= ast->frame_offset; + if(!st->nb_index_entries) + continue; + if(ast->sample_size) ts /= ast->sample_size; ts = av_rescale_q(ts, st->time_base, AV_TIME_BASE_Q); // av_log(s, AV_LOG_DEBUG, "%"PRId64" %d/%d %"PRId64"\n", ts, st->time_base.num, st->time_base.den, ast->frame_offset); - if(ts < best_ts && st->nb_index_entries){ + if(ts < best_ts){ best_ts= ts; best_st= st; best_stream_index= i;