diff options
author | wm4 <wm4@nowhere> | 2013-12-21 20:36:45 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-21 21:43:16 +0100 |
commit | 0335011f11d9d13f70db6c46ed6189a74d48ec67 (patch) | |
tree | 03a146b06b5a8c405f5c521abadeeea35c296920 /player/loadfile.c | |
parent | 3dbc9007b080028f0aebbbf8b9ab1233cd70c45b (diff) | |
download | mpv-0335011f11d9d13f70db6c46ed6189a74d48ec67.tar.bz2 mpv-0335011f11d9d13f70db6c46ed6189a74d48ec67.tar.xz |
stream: mp_msg conversions
We also drop some slave mode stuff from stream_vcd.
Diffstat (limited to 'player/loadfile.c')
-rw-r--r-- | player/loadfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index 1d668b9c2c..63c83e64e4 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -724,7 +724,7 @@ static struct track *open_external_file(struct MPContext *mpctx, char *filename, char *disp_filename = filename; if (strncmp(disp_filename, "memory://", 9) == 0) disp_filename = "memory://"; // avoid noise - struct stream *stream = stream_open(filename, mpctx->opts); + struct stream *stream = stream_open(filename, mpctx->global); if (!stream) goto err_out; stream_enable_cache_percent(&stream, stream_cache, @@ -1046,7 +1046,7 @@ static void play_current_file(struct MPContext *mpctx) } stream_filename = mpctx->resolve_result->url; } - mpctx->stream = stream_open(stream_filename, opts); + mpctx->stream = stream_open(stream_filename, mpctx->global); if (!mpctx->stream) { // error... demux_was_interrupted(mpctx); goto terminate_playback; |