summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-17 18:30:33 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-17 18:30:33 +0000
commit450d40d4434de9f886c00b33a8b3059d528d0558 (patch)
tree26f40a3a401d30cf416a3d99a577977d0cfae255
parent98ab90d2ca4cb2b3b2e634ba8e08c12930ee236d (diff)
downloadmpv-450d40d4434de9f886c00b33a8b3059d528d0558.tar.bz2
mpv-450d40d4434de9f886c00b33a8b3059d528d0558.tar.xz
Fall back to read-based seeking for ffmpeg:// URLs when is_streamed is set
(i.e. it is not possible to use url_fseek). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29928 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--stream/stream_ffmpeg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/stream/stream_ffmpeg.c b/stream/stream_ffmpeg.c
index c7a4dde541..c681dc2c88 100644
--- a/stream/stream_ffmpeg.c
+++ b/stream/stream_ffmpeg.c
@@ -112,11 +112,11 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format)
if (size >= 0)
stream->end_pos = size;
stream->type = STREAMTYPE_FILE;
+ stream->seek = seek;
if (ctx->is_streamed) {
stream->type = STREAMTYPE_STREAM;
- stream->flags |= STREAM_SEEK_FW;
+ stream->seek = NULL;
}
- stream->seek = seek;
stream->fill_buffer = fill_buffer;
stream->write_buffer = write_buffer;
stream->control = control;