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_s3fb.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_s3fb.c')
-rw-r--r-- | libvo/vo_s3fb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libvo/vo_s3fb.c b/libvo/vo_s3fb.c index 7cd36fe762..da2408f146 100644 --- a/libvo/vo_s3fb.c +++ b/libvo/vo_s3fb.c @@ -71,7 +71,7 @@ static uint32_t in_width, in_height, in_format, in_depth, in_s3_format, static char *inpage, *inpage0, *smem = NULL; static void (*alpha_func)(); -static void clear_screen(); +static void clear_screen(void); /* streams registers */ #define PSTREAM_CONTROL_REG 0x8180 @@ -116,7 +116,7 @@ void writecrtc(int reg, int value) { } // enable S3 registers -int enable() { +int enable(void) { int fd; if (v) @@ -148,7 +148,7 @@ int enable() { return 0; } -void disable() { +void disable(void) { if (v) { writecrtc(0x53, v->cr53); writecrtc(0x39, v->cr39); @@ -227,7 +227,7 @@ int yuv_on(int format, int src_w, int src_h, int dst_x, int dst_y, int dst_w, in return offset; } -void yuv_off() { +void yuv_off(void) { writecrtc(0x67, readcrtc(0x67) & ~0xc); memset(v->mmio + 0x8180, 0, 0x80); OUTREG(0x81b8, 0x900); @@ -328,7 +328,7 @@ static void uninit(void) } } -static void clear_screen() +static void clear_screen(void) { if (inpage0) { int n; |