From 4195a345a51e52337bc972aacbce0fd6e88ebb5d Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 17 Jan 2016 18:07:50 +0100 Subject: player: refactor: eliminate MPContext.d_video Eventually we want the VO be driven by a A->V filter, so a decoder doesn't even have to exist. Some features definitely require a decoder though (like reporting the decoder in use, hardware decoding, etc.), so for each thing which accessed d_video, it has to be redecided if and how it can access decoder state. At least the "framedrop" property slightly changes semantics: you can now always set this property, even if no video is active. Some untested changes in this commit, but our bio-based distributed test suite has to take care of this. --- player/loadfile.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'player/loadfile.c') diff --git a/player/loadfile.c b/player/loadfile.c index 88004a0ec1..aecdbf46de 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -60,7 +60,6 @@ static void uninit_demuxer(struct MPContext *mpctx) { - assert(!mpctx->d_video && !mpctx->d_audio); for (int r = 0; r < NUM_PTRACKS; r++) { for (int t = 0; t < STREAM_TYPE_COUNT; t++) mpctx->current_track[r][t] = NULL; @@ -1088,8 +1087,6 @@ reopen_file: assert(mpctx->stream == NULL); assert(mpctx->demuxer == NULL); - assert(mpctx->d_audio == NULL); - assert(mpctx->d_video == NULL); if (process_open_hooks(mpctx) < 0) goto terminate_playback; -- cgit v1.2.3