[SCM] libav/experimental: Support non interleaved avi with phantom streams.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 2be83b96b6d51fdc41c9d21e87e0f62f23ede263
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon May 26 20:29:16 2008 +0000

    Support non interleaved avi with phantom streams.
    
    Originally committed as revision 13436 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index ef54464..a312670 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -642,7 +642,7 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
             ts= av_rescale(ts, AV_TIME_BASE * (int64_t)st->time_base.num, st->time_base.den);
 
 //            av_log(NULL, AV_LOG_DEBUG, "%"PRId64" %d/%d %"PRId64"\n", ts, st->time_base.num, st->time_base.den, ast->frame_offset);
-            if(ts < best_ts){
+            if(ts < best_ts && st->nb_index_entries){
                 best_ts= ts;
                 best_st= st;
                 best_stream_index= i;

-- 
Libav/FFmpeg packaging