Commit 8f0a8c70 authored by michael's avatar michael

fixing pipe seek bug


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3730 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent ac1ab572
...@@ -107,6 +107,7 @@ static int pipe_open(URLContext *h, const char *filename, int flags) ...@@ -107,6 +107,7 @@ static int pipe_open(URLContext *h, const char *filename, int flags)
setmode(fd, O_BINARY); setmode(fd, O_BINARY);
#endif #endif
h->priv_data = (void *)(size_t)fd; h->priv_data = (void *)(size_t)fd;
h->is_streamed = 1;
return 0; return 0;
} }
......
...@@ -1617,7 +1617,7 @@ static void av_estimate_timings(AVFormatContext *ic) ...@@ -1617,7 +1617,7 @@ static void av_estimate_timings(AVFormatContext *ic)
} }
ic->file_size = file_size; 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 */ /* get accurate estimate from the PTSes */
av_estimate_timings_from_pts(ic); av_estimate_timings_from_pts(ic);
} else if (av_has_timings(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