From bb679dd40a80e72272dec0c8621b888f4365852c Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Thu, 24 Apr 2008 08:16:11 +0300 Subject: Remove global vo_flags Move the information to struct sh_video field. --- mplayer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index 5f06ab8fc8..d2bee07ce4 100644 --- a/mplayer.c +++ b/mplayer.c @@ -2123,7 +2123,7 @@ static int sleep_until_update(struct MPContext *mpctx, float *time_frame, //============================== SLEEP: =================================== // flag 256 means: libvo driver does its timing (dvb card) - if (*time_frame > 0.001 && !(vo_flags&256)) + if (*time_frame > 0.001 && !(mpctx->sh_video->output_flags&256)) *time_frame = timing_sleep(*time_frame); return frame_time_remaining; } @@ -3551,7 +3551,7 @@ if(!reinit_video_chain(mpctx)) { } } - if(vo_flags & 0x08 && vo_spudec) + if(mpctx->sh_video->output_flags & 0x08 && vo_spudec) spudec_set_hw_spu(vo_spudec,mpctx->video_out); #ifdef HAVE_FREETYPE -- cgit v1.2.3