summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authormswitch <mswitch@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-18 17:34:20 +0000
committermswitch <mswitch@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-18 17:34:20 +0000
commit41277cabf67423ffe06f2588c29f4e311ba569dd (patch)
treed43f5418a0261d2c045eca23119d51bb02f8d578 /mplayer.c
parent6842124760e41665342000477e751baa91cf0713 (diff)
downloadmpv-41277cabf67423ffe06f2588c29f4e311ba569dd.tar.bz2
mpv-41277cabf67423ffe06f2588c29f4e311ba569dd.tar.xz
Added VOCTRL_PAUSE and VOCTRL_RESUME
Fixed playback bug in vo_dxr3 which would cause syncloss when playing ntsc movies on pal and vice versa (this does not affect mpeg playback as we still don't know how to set the internal fps registers) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4755 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index f8d7b465c8..f0056de7df 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1957,6 +1957,9 @@ read_input:
#ifdef HAVE_NEW_GUI
if(use_gui) mplShMem->Playing=2;
#endif
+ if (video_out && sh_video)
+ video_out->control(VOCTRL_PAUSE, NULL);
+
if (audio_out && sh_audio)
audio_out->pause(); // pause audio, keep data if possible
@@ -2005,6 +2008,8 @@ read_input:
osd_function=OSD_PLAY;
if (audio_out && sh_audio)
audio_out->resume(); // resume audio
+ if (video_out && sh_video)
+ video_out->control(VOCTRL_RESUME, NULL); // resume video
(void)GetRelativeTime(); // keep TF around FT in next cycle
#ifdef HAVE_NEW_GUI
if(use_gui && !gui_pause_flag) mplShMem->Playing=1; // play from keyboard