aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-16 05:13:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-16 05:13:58 +0100
commite098fba5d9c9d52aaddd83e63dd910ff20b841d2 (patch)
tree9d6d6f780dfdc7b208c38ac10b6fc98fde1fe150 /libavformat
parent84e57702ea5cb37f5caf9fc2bd6bc58b597bcb0f (diff)
downloadffmpeg-e098fba5d9c9d52aaddd83e63dd910ff20b841d2.tar.gz
avidec: Fix infinite loop caused by rounding of timestamps in non interleaved avis.
Fixes Ticket775 Bug found by: Diana Elena Muscalu Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avidec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index c74aa1096e..05f5d58290 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1050,7 +1050,7 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR_EOF;
best_ast = best_st->priv_data;
- best_ts = av_rescale_q(best_ts, (AVRational){FFMAX(1, best_ast->sample_size), AV_TIME_BASE}, best_st->time_base);
+ best_ts = best_ast->frame_offset;
if(best_ast->remaining)
i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY | AVSEEK_FLAG_BACKWARD);
else{