From b5f620ae75f964c01e5c0fc983e6d5af9f452750 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 23 Feb 2016 22:15:10 +0100 Subject: 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. --- player/loadfile.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'player/loadfile.c') 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); -- cgit v1.2.3