diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2010-05-21 20:24:08 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2010-05-21 20:24:08 +0000 |
| commit | 7d8b893b7e7b86c760e6c35c5e422e55b4386b89 (patch) | |
| tree | ad7992bec0c4b5eccd1f8619025e6f56386d8129 | |
| parent | e6ef35bc22681895983ce28809dd6b2544cfb5a8 (diff) | |
Disable non interleaved avi code when there is no index available.
Fixes issue1956.
backport r23202 by michael
Originally committed as revision 23230 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
| -rw-r--r-- | libavformat/avidec.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index e866a93480..485c4eb93a 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -650,6 +650,16 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) avi_load_index(s); avi->index_loaded = 1; avi->non_interleaved |= guess_ni_flag(s); + for(i=0; i<s->nb_streams; i++){ + AVStream *st = s->streams[i]; + if(st->nb_index_entries) + break; + } + if(i==s->nb_streams && avi->non_interleaved) { + av_log(s, AV_LOG_WARNING, "non-interleaved AVI without index, switching to interleaved\n"); + avi->non_interleaved=0; + } + if(avi->non_interleaved) { av_log(s, AV_LOG_INFO, "non-interleaved AVI\n"); clean_index(s); |