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 /TOOLS/fastmemcpybench.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 'TOOLS/fastmemcpybench.c')
| -rw-r--r-- | TOOLS/fastmemcpybench.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/TOOLS/fastmemcpybench.c b/TOOLS/fastmemcpybench.c index 35f7914285..2d8ac2b03d 100644 --- a/TOOLS/fastmemcpybench.c +++ b/TOOLS/fastmemcpybench.c @@ -7,6 +7,8 @@ tested it. */ +/* According to Uoti this code is broken. */ + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -28,8 +30,8 @@ static mga_vid_config_t mga_vid_config; static unsigned char* frame=NULL; static int f; -static int mga_init(){ - +static int mga_init(void) +{ f = open("/dev/mga_vid",O_RDWR); if(f == -1) { @@ -74,7 +76,8 @@ static int mga_init(){ #endif // Returns current time in microseconds -static unsigned int GetTimer(){ +static unsigned int GetTimer(void) +{ struct timeval tv; struct timezone tz; // float s; |