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 /loader/win32.c | |
| 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 'loader/win32.c')
| -rw-r--r-- | loader/win32.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/loader/win32.c b/loader/win32.c index e03ee4c0a5..73222808e0 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -1273,8 +1273,8 @@ static int critsecs_get_pos(CRITICAL_SECTION *cs_win) for (i=0; i < CRITSECS_LIST_MAX; i++) if (critsecs_list[i].cs_win == cs_win) - return(i); - return(-1); + return i; + return -1; } static int critsecs_get_unused(void) @@ -1283,8 +1283,8 @@ static int critsecs_get_unused(void) for (i=0; i < CRITSECS_LIST_MAX; i++) if (critsecs_list[i].cs_win == NULL) - return(i); - return(-1); + return i; + return -1; } struct CRITSECT *critsecs_get_unix(CRITICAL_SECTION *cs_win) @@ -1293,8 +1293,8 @@ struct CRITSECT *critsecs_get_unix(CRITICAL_SECTION *cs_win) for (i=0; i < CRITSECS_LIST_MAX; i++) if (critsecs_list[i].cs_win == cs_win && critsecs_list[i].cs_unix) - return(critsecs_list[i].cs_unix); - return(NULL); + return critsecs_list[i].cs_unix; + return NULL; } #endif |