[SCM] libav/experimental: dont load the index if we cant seek back

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b7b225581f08a50a183927bd52aeb8c1b028a36d
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Jun 14 00:32:10 2006 +0000

    dont load the index if we cant seek back
    
    Originally committed as revision 5475 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index d7830b8..85e819c 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -429,8 +429,10 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
             break;
         case MKTAG('i', 'n', 'd', 'x'):
             i= url_ftell(pb);
-            read_braindead_odml_indx(s, 0);
-            avi->index_loaded=1;
+            if(!url_is_streamed(pb)){
+                read_braindead_odml_indx(s, 0);
+                avi->index_loaded=1;
+            }
             url_fseek(pb, i+size, SEEK_SET);
             break;
         default:
@@ -451,7 +453,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
         return -1;
     }
 
-    if(!avi->index_loaded)
+    if(!avi->index_loaded && !url_is_streamed(pb))
         avi_load_index(s);
     avi->index_loaded = 1;
     avi->non_interleaved |= guess_ni_flag(s);

-- 
Libav/FFmpeg packaging