summaryrefslogtreecommitdiffstats
path: root/player/loadfile.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-02-23 22:15:10 +0100
committerwm4 <wm4@nowhere>2016-02-23 23:08:24 +0100
commitb5f620ae75f964c01e5c0fc983e6d5af9f452750 (patch)
tree686bfe8d858db91d12010c30923417138489c34d /player/loadfile.c
parent36c6c0f79b84b7e82da468126e160dffce92e1c5 (diff)
downloadmpv-b5f620ae75f964c01e5c0fc983e6d5af9f452750.tar.bz2
mpv-b5f620ae75f964c01e5c0fc983e6d5af9f452750.tar.xz
player: remove unused MPContext.stream field
It was just dead code. Also fixes the stream-open-filename property, which is supposed to be read-only if a file was already opened.
Diffstat (limited to 'player/loadfile.c')
-rw-r--r--player/loadfile.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 7513e0b0b4..5b94a12dc7 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -83,12 +83,6 @@ static void uninit_demuxer(struct MPContext *mpctx)
mpctx->demuxer = NULL;
}
-static void uninit_stream(struct MPContext *mpctx)
-{
- free_stream(mpctx->stream);
- mpctx->stream = NULL;
-}
-
#define APPEND(s, ...) mp_snprintf_cat(s, sizeof(s), __VA_ARGS__)
static void print_stream(struct MPContext *mpctx, struct track *t)
@@ -1047,7 +1041,6 @@ static void play_current_file(struct MPContext *mpctx)
reopen_file:
- assert(mpctx->stream == NULL);
assert(mpctx->demuxer == NULL);
if (process_open_hooks(mpctx) < 0)
@@ -1215,7 +1208,6 @@ terminate_playback:
uninit_video_chain(mpctx);
uninit_sub_all(mpctx);
uninit_demuxer(mpctx);
- uninit_stream(mpctx);
if (!opts->gapless_audio && !mpctx->encode_lavc_ctx)
uninit_audio_out(mpctx);