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 | |
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')
-rw-r--r-- | loader/driver.c | 6 | ||||
-rw-r--r-- | loader/dshow/mediatype.c | 4 | ||||
-rw-r--r-- | loader/qtx/qtxload.c | 2 | ||||
-rw-r--r-- | loader/win32.c | 12 | ||||
-rw-r--r-- | loader/wine/heap.h | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/loader/driver.c b/loader/driver.c index e7e50326e4..a59b28e67d 100644 --- a/loader/driver.c +++ b/loader/driver.c @@ -158,7 +158,7 @@ HDRVR DrvOpen(LPARAM lParam2) hDriver = (NPDRVR) malloc(sizeof(DRVR)); if (!hDriver) - return ((HDRVR) 0); + return (HDRVR) 0; memset((void*)hDriver, 0, sizeof(DRVR)); #ifdef WIN32_LOADER @@ -171,7 +171,7 @@ HDRVR DrvOpen(LPARAM lParam2) { printf("Can't open library %s\n", filename); DrvClose((HDRVR)hDriver); - return ((HDRVR) 0); + return (HDRVR) 0; } hDriver->DriverProc = (DRIVERPROC) GetProcAddress(hDriver->hDriverModule, @@ -180,7 +180,7 @@ HDRVR DrvOpen(LPARAM lParam2) { printf("Library %s is not a valid VfW/ACM codec\n", filename); DrvClose((HDRVR)hDriver); - return ((HDRVR) 0); + return (HDRVR) 0; } TRACE("DriverProc == %X\n", hDriver->DriverProc); diff --git a/loader/dshow/mediatype.c b/loader/dshow/mediatype.c index 080c296c88..fc37f972f3 100644 --- a/loader/dshow/mediatype.c +++ b/loader/dshow/mediatype.c @@ -156,6 +156,6 @@ void DeleteMediaType(AM_MEDIA_TYPE * pMediaType) #define IsEqualGUID(a,b) (memcmp(a,b,16)==0) int CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, int bWildcards) { - return (((bWildcards && (IsEqualGUID(&pmt1->majortype, &GUID_NULL) || IsEqualGUID(&pmt2->majortype, &GUID_NULL))) || IsEqualGUID(&pmt1->majortype, &pmt2->majortype)) && - ((bWildcards && (IsEqualGUID(&pmt1->subtype, &GUID_NULL) || IsEqualGUID(&pmt2->subtype, &GUID_NULL))) || IsEqualGUID(&pmt1->subtype, &pmt2->subtype))); + return ((bWildcards && (IsEqualGUID(&pmt1->majortype, &GUID_NULL) || IsEqualGUID(&pmt2->majortype, &GUID_NULL))) || IsEqualGUID(&pmt1->majortype, &pmt2->majortype)) && + ((bWildcards && (IsEqualGUID(&pmt1->subtype, &GUID_NULL) || IsEqualGUID(&pmt2->subtype, &GUID_NULL))) || IsEqualGUID(&pmt1->subtype, &pmt2->subtype)); } diff --git a/loader/qtx/qtxload.c b/loader/qtx/qtxload.c index 88dc032d33..772ee5b0c5 100644 --- a/loader/qtx/qtxload.c +++ b/loader/qtx/qtxload.c @@ -17,7 +17,7 @@ ComponentResult ComponentDummy( params, globals, ComponentDispatch); printf(" Dummy: global datas: %p\n", *globals); printf(" Dummy: returning 0\n"); - return(0); + return 0; } char *get_path(const char* x){ return strdup(x);} 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 diff --git a/loader/wine/heap.h b/loader/wine/heap.h index 52e2f1c868..592bf8259c 100644 --- a/loader/wine/heap.h +++ b/loader/wine/heap.h @@ -33,7 +33,7 @@ extern LPSTR HEAP_strdupWtoA( HANDLE heap, DWORD flags, LPCWSTR str ); (HIWORD(str) ? HEAP_strdupWtoA( SegptrHeap, 0, (str) ) : (LPSTR)(str)) /* define an inline function, a macro won't do */ static inline SEGPTR WINE_UNUSED SEGPTR_Get(LPCVOID ptr) { - return (HIWORD(ptr) ? HEAP_GetSegptr( SegptrHeap, 0, ptr ) : (SEGPTR)ptr); + return HIWORD(ptr) ? HEAP_GetSegptr( SegptrHeap, 0, ptr ) : (SEGPTR)ptr; } #define SEGPTR_GET(ptr) SEGPTR_Get(ptr) #define SEGPTR_FREE(ptr) \ |