diff options
| author | wm4 <wm4@nowhere> | 2016-02-23 22:15:10 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-02-23 23:08:24 +0100 |
| commit | b5f620ae75f964c01e5c0fc983e6d5af9f452750 (patch) | |
| tree | 686bfe8d858db91d12010c30923417138489c34d | |
| parent | 36c6c0f79b84b7e82da468126e160dffce92e1c5 (diff) | |
| download | mpv-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.
| -rw-r--r-- | player/command.c | 2 | ||||
| -rw-r--r-- | player/core.h | 2 | ||||
| -rw-r--r-- | player/loadfile.c | 8 |
3 files changed, 1 insertions, 11 deletions
diff --git a/player/command.c b/player/command.c index c6ba268dbf..642330e34f 100644 --- a/player/command.c +++ b/player/command.c @@ -350,7 +350,7 @@ static int mp_property_stream_open_filename(void *ctx, struct m_property *prop, return M_PROPERTY_UNAVAILABLE; switch (action) { case M_PROPERTY_SET: { - if (mpctx->stream) + if (mpctx->demuxer) return M_PROPERTY_ERROR; mpctx->stream_open_filename = talloc_strdup(mpctx->stream_open_filename, *(char **)arg); diff --git a/player/core.h b/player/core.h index 02bd01b03f..7f4104780f 100644 --- a/player/core.h +++ b/player/core.h @@ -273,8 +273,6 @@ typedef struct MPContext { // Current file statistics int64_t shown_vframes, shown_aframes; - struct stream *stream; // stream that was initially opened - struct demux_chapter *chapters; int num_chapters; 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); |