diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
| commit | d5c868325cefcd5fad53361d1dfdc9757674eb70 (patch) | |
| tree | a838e509fdc2468220466e6337097b3ef590b00c /osdep | |
| parent | 0cb5123c8f65b3d7715deb22ce8430eccc21996e (diff) | |
| parent | 5b3834c5d1033f05d798278c33782c5563247062 (diff) | |
| download | mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.bz2 mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.xz | |
Merge svn changes up to r26979
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/getch2-win.c | 2 | ||||
| -rw-r--r-- | osdep/shmem.c | 2 | ||||
| -rw-r--r-- | osdep/timer-linux.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c index 4d42bec878..6f9567c3db 100644 --- a/osdep/getch2-win.c +++ b/osdep/getch2-win.c @@ -101,7 +101,7 @@ static int getch2_internal(void) } /*check for function keys*/ if(0x87 >= eventbuffer[i].Event.KeyEvent.wVirtualKeyCode && eventbuffer[i].Event.KeyEvent.wVirtualKeyCode >= 0x70) - return (KEY_F + 1 + eventbuffer[i].Event.KeyEvent.wVirtualKeyCode - 0x70); + return KEY_F + 1 + eventbuffer[i].Event.KeyEvent.wVirtualKeyCode - 0x70; /*only characters should be remaining*/ //printf("getch2: YOU PRESSED \"%c\" \n",eventbuffer[i].Event.KeyEvent.uChar.AsciiChar); diff --git a/osdep/shmem.c b/osdep/shmem.c index 5c47bdf382..1adacfaef5 100644 --- a/osdep/shmem.c +++ b/osdep/shmem.c @@ -84,7 +84,7 @@ while(1){ return p; #else mp_msg(MSGT_OSDEP, MSGL_FATAL, "shmem: no SHM support was compiled in!\n"); - return(NULL); + return NULL; #endif } default: diff --git a/osdep/timer-linux.c b/osdep/timer-linux.c index f32f92f392..972049ac5f 100644 --- a/osdep/timer-linux.c +++ b/osdep/timer-linux.c @@ -32,14 +32,14 @@ int usec_sleep(int usec_delay) unsigned int GetTimer(void){ struct timeval tv; gettimeofday(&tv,NULL); - return (tv.tv_sec*1000000+tv.tv_usec); + return tv.tv_sec * 1000000 + tv.tv_usec; } // Returns current time in milliseconds unsigned int GetTimerMS(void){ struct timeval tv; gettimeofday(&tv,NULL); - return (tv.tv_sec*1000+tv.tv_usec/1000); + return tv.tv_sec * 1000 + tv.tv_usec / 1000; } // Initialize timer, must be called at least once at start |