diff options
| author | wm4 <wm4@nowhere> | 2012-12-14 12:59:05 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-01-13 20:04:10 +0100 |
| commit | b7cacf9165290067b66b160b108790b89c080a3e (patch) | |
| tree | 1888a01e5be359eb91531305e2427509722fa7a9 /core | |
| parent | 1f32250629c990859b0f6a7d70bcbe3bd2d6afae (diff) | |
| download | mpv-b7cacf9165290067b66b160b108790b89c080a3e.tar.bz2 mpv-b7cacf9165290067b66b160b108790b89c080a3e.tar.xz | |
video/out: replace VFCAP_TIMER with vo->untimed, fix vo_image and vo_lavc
VFCAP_TIMER disables any additional waiting done by mpv in the
playloop. Remove VFCAP_TIMER, but re-use the idea for vo_image and
vo_lavc.
This means --untimed doesn't have to be passed when using --vo=image.
Diffstat (limited to 'core')
| -rw-r--r-- | core/mplayer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/mplayer.c b/core/mplayer.c index 48375ee9df..8cbf7db002 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -3321,7 +3321,7 @@ static void run_playloop(struct MPContext *mpctx) * If untimed is set always output frames immediately * without sleeping. */ - if (mpctx->time_frame < -0.2 || opts->untimed) + if (mpctx->time_frame < -0.2 || opts->untimed || vo->untimed) mpctx->time_frame = 0; } @@ -3344,8 +3344,7 @@ static void run_playloop(struct MPContext *mpctx) mpctx->time_frame -= get_relative_time(mpctx); mpctx->time_frame -= vo->flip_queue_offset; - if (mpctx->time_frame > 0.001 - && !(mpctx->sh_video->output_flags & VFCAP_TIMER)) + if (mpctx->time_frame > 0.001) mpctx->time_frame = timing_sleep(mpctx, mpctx->time_frame); mpctx->time_frame += vo->flip_queue_offset; @@ -4446,7 +4445,6 @@ int main(int argc, char *argv[]) m_config_set_option0(mpctx->mconfig, "ao", "lavc"); m_config_set_option0(mpctx->mconfig, "fixed-vo", "yes"); m_config_set_option0(mpctx->mconfig, "gapless-audio", "yes"); - m_config_set_option0(mpctx->mconfig, "untimed", "yes"); } #endif |