diff options
| author | wm4 <wm4@nowhere> | 2015-02-03 23:09:02 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-02-03 23:11:08 +0100 |
| commit | c3c714b05903c26656e14c0bf229d873b73a0899 (patch) | |
| tree | 40cbcace0e0302a1c238d4a9581c097272b5e742 /player | |
| parent | de81cb07f42cc4dcbe64c1e01741528677c28180 (diff) | |
| download | mpv-c3c714b05903c26656e14c0bf229d873b73a0899.tar.bz2 mpv-c3c714b05903c26656e14c0bf229d873b73a0899.tar.xz | |
player: remove --fixed-vo
In ancient times, this was needed because it was not default, and many
VOs had problems with it. But it was always default in mpv, and all VOs
are required to deal with it. Also, running --fixed-vo=no is not useful
and just creates weird corner cases. Get rid of it.
Diffstat (limited to 'player')
| -rw-r--r-- | player/loadfile.c | 6 | ||||
| -rw-r--r-- | player/main.c | 1 | ||||
| -rw-r--r-- | player/video.c | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index bb15068ead..db032d422c 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -282,8 +282,6 @@ static bool timeline_set_part(struct MPContext *mpctx, int i, bool initial) uninit_audio_chain(mpctx); uninit_video_chain(mpctx); uninit_sub_all(mpctx); - if (!mpctx->opts->fixed_vo) - uninit_video_out(mpctx); if (mpctx->ao && !mpctx->opts->gapless_audio) { ao_drain(mpctx->ao); uninit_audio_out(mpctx); @@ -533,7 +531,7 @@ void mp_switch_track_n(struct MPContext *mpctx, int order, enum stream_type type if (order == 0) { if (type == STREAM_VIDEO) { uninit_video_chain(mpctx); - if (!mpctx->opts->fixed_vo || !track) + if (!track) handle_force_window(mpctx, false); } else if (type == STREAM_AUDIO) { clear_audio_output_buffers(mpctx); @@ -1236,8 +1234,6 @@ terminate_playback: uninit_sub_renderer(mpctx); uninit_demuxer(mpctx); uninit_stream(mpctx); - if (!opts->fixed_vo) - uninit_video_out(mpctx); if (!opts->gapless_audio && !mpctx->encode_lavc_ctx) uninit_audio_out(mpctx); diff --git a/player/main.c b/player/main.c index 2dfc9b5dde..854d1ce540 100644 --- a/player/main.c +++ b/player/main.c @@ -446,7 +446,6 @@ int mp_initialize(struct MPContext *mpctx) #endif if (opts->force_vo) { - opts->fixed_vo = 1; struct vo_extra ex = { .input_ctx = mpctx->input, .osd = mpctx->osd, diff --git a/player/video.c b/player/video.c index 17530ab279..29dcb3b066 100644 --- a/player/video.c +++ b/player/video.c @@ -266,7 +266,7 @@ int reinit_video_chain(struct MPContext *mpctx) sh->video->fps); //================== Init VIDEO (codec & libvo) ========================== - if (!opts->fixed_vo || !mpctx->video_out) { + if (!mpctx->video_out) { struct vo_extra ex = { .input_ctx = mpctx->input, .osd = mpctx->osd, |