[SCM] libav/experimental: fixing pipe seek bug

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f9a35124a7b4bde1898727b52c3bc62587ff1505
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Dec 6 00:08:37 2004 +0000

    fixing pipe seek bug
    
    Originally committed as revision 3730 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/file.c b/libavformat/file.c
index f7329e7..fc75ee0 100644
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -107,6 +107,7 @@ static int pipe_open(URLContext *h, const char *filename, int flags)
     setmode(fd, O_BINARY);
 #endif
     h->priv_data = (void *)(size_t)fd;
+    h->is_streamed = 1;
     return 0;
 }
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index ddfadde..5b17c64 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1617,7 +1617,7 @@ static void av_estimate_timings(AVFormatContext *ic)
     }
     ic->file_size = file_size;
 
-    if (ic->iformat == &mpegps_demux) {
+    if (ic->iformat == &mpegps_demux && file_size && !ic->pb.is_streamed) {
         /* get accurate estimate from the PTSes */
         av_estimate_timings_from_pts(ic);
     } else if (av_has_timings(ic)) {

-- 
Libav/FFmpeg packaging