Commit f9a35124 authored by Michael Niedermayer's avatar Michael Niedermayer

fixing pipe seek bug

Originally committed as revision 3730 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e7ddb0cf
......@@ -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;
}
......
......@@ -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)) {
......
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