Commit b60de406 authored by Maksym Veremeyenko's avatar Maksym Veremeyenko Committed by Carl Eugen Hoyos

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
parent 0e1baede
...@@ -680,12 +680,15 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -680,12 +680,15 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
AVIStream *ast = st->priv_data; AVIStream *ast = st->priv_data;
int64_t ts= ast->frame_offset; int64_t ts= ast->frame_offset;
if(!st->nb_index_entries)
continue;
if(ast->sample_size) if(ast->sample_size)
ts /= ast->sample_size; ts /= ast->sample_size;
ts = av_rescale_q(ts, st->time_base, AV_TIME_BASE_Q); 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); // 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_ts= ts;
best_st= st; best_st= st;
best_stream_index= i; best_stream_index= i;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment