diff options
| author | wm4 <wm4@nowhere> | 2016-01-17 18:07:50 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-01-17 18:38:07 +0100 |
| commit | 4195a345a51e52337bc972aacbce0fd6e88ebb5d (patch) | |
| tree | 267a57310fffe943845d7ce2058447ccd7f7458d /player/loadfile.c | |
| parent | 004bc9526308c6bc3f51591423e88bb1adaff167 (diff) | |
| download | mpv-4195a345a51e52337bc972aacbce0fd6e88ebb5d.tar.bz2 mpv-4195a345a51e52337bc972aacbce0fd6e88ebb5d.tar.xz | |
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.
Diffstat (limited to 'player/loadfile.c')
| -rw-r--r-- | player/loadfile.c | 3 |
1 files changed, 0 insertions, 3 deletions
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; |