diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /libvo/vo_xvr100.c | |
parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'libvo/vo_xvr100.c')
-rw-r--r-- | libvo/vo_xvr100.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libvo/vo_xvr100.c b/libvo/vo_xvr100.c index 433c30290a..7a82c436fb 100644 --- a/libvo/vo_xvr100.c +++ b/libvo/vo_xvr100.c @@ -135,7 +135,7 @@ static uint32_t pfb_colorkey; -void pfb_overlay_on() { +void pfb_overlay_on(void) { int h_inc, h_step, ecp_div; pfb_vregs[PFB_CLOCK_CNTL_INDEX] = (pfb_vregs[PFB_CLOCK_CNTL_INDEX] & ~0x0000003f) | 0x00000008; @@ -192,11 +192,11 @@ void pfb_overlay_on() { pfb_vregs[PFB_OV0_AUTO_FLIP_CNTL] = PFB_OV0_AUTO_FLIP_BUF0; } -void pfb_overlay_off() { +void pfb_overlay_off(void) { pfb_vregs[PFB_OV0_SCALE_CNTL] = 0; } -void center_overlay() { +void center_overlay(void) { if (pfb_xres > pfb_dstwidth) { pfb_wx0 = (pfb_xres - pfb_dstwidth) / 2; pfb_wx1 = pfb_wx0 + pfb_dstwidth; @@ -321,7 +321,7 @@ static void uninit(void) munmap(pfb_vregs, PFB_REGS_MMAPLEN); } -static uint32_t pfb_fullscreen() { +static uint32_t pfb_fullscreen(void) { if (!pfb_fs) { aspect(&pfb_dstwidth,&pfb_dstheight, A_ZOOM); pfb_fs = 1; |