Commit 25983dcd authored by Michael Niedermayer's avatar Michael Niedermayer

Fix non interleaved variable fps ODML avis.

Fixed issue738

Originally committed as revision 16127 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 39caffeb
...@@ -668,8 +668,11 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -668,8 +668,11 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
best_ts= av_rescale(best_ts, best_st->time_base.den, AV_TIME_BASE * (int64_t)best_st->time_base.num); //FIXME a little ugly best_ts= av_rescale(best_ts, best_st->time_base.den, AV_TIME_BASE * (int64_t)best_st->time_base.num); //FIXME a little ugly
if(best_ast->remaining) if(best_ast->remaining)
i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY | AVSEEK_FLAG_BACKWARD); i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY | AVSEEK_FLAG_BACKWARD);
else else{
i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY); i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY);
if(i>=0)
best_ast->frame_offset= best_st->index_entries[i].timestamp;
}
// av_log(NULL, AV_LOG_DEBUG, "%d\n", i); // av_log(NULL, AV_LOG_DEBUG, "%d\n", i);
if(i>=0){ if(i>=0){
......
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