diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-18 01:07:37 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-18 01:45:36 +0200 |
| commit | 186e5a998c8424b3c850b62d6f5755a0928cd64c (patch) | |
| tree | cabc9881fb5ed2c6dbe5f771323a55c50136a091 /loader | |
| parent | 41ac08d2b45f0f6eb369ea57604796be69200185 (diff) | |
| parent | e5ee1232c5e00e730d69cf57767b1ee3ab5b4e16 (diff) | |
| download | mpv-186e5a998c8424b3c850b62d6f5755a0928cd64c.tar.bz2 mpv-186e5a998c8424b3c850b62d6f5755a0928cd64c.tar.xz | |
Merge svn changes up to r28641
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/drv.c | 2 | ||||
| -rw-r--r-- | loader/dshow/DS_AudioDecoder.c | 2 | ||||
| -rw-r--r-- | loader/ext.c | 2 | ||||
| -rw-r--r-- | loader/qtx/list.c | 2 | ||||
| -rw-r--r-- | loader/qtx/qtxload.c | 2 | ||||
| -rw-r--r-- | loader/win32.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/loader/drv.c b/loader/drv.c index b8fecf7467..e3fb4da116 100644 --- a/loader/drv.c +++ b/loader/drv.c @@ -7,7 +7,7 @@ #include "debug.h" #include <stdio.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif #include <stdlib.h> diff --git a/loader/dshow/DS_AudioDecoder.c b/loader/dshow/DS_AudioDecoder.c index 2ac48cd25e..645c8b517b 100644 --- a/loader/dshow/DS_AudioDecoder.c +++ b/loader/dshow/DS_AudioDecoder.c @@ -184,7 +184,7 @@ int DS_AudioDecoder_GetSrcSize(DS_AudioDecoder *this, int dest_size) { double efficiency =(double) this->in_fmt.nAvgBytesPerSec / (this->in_fmt.nSamplesPerSec*this->in_fmt.nBlockAlign); - int frames = (int)(dest_size*efficiency);; + int frames = (int)(dest_size*efficiency); if (frames < 1) frames = 1; diff --git a/loader/ext.c b/loader/ext.c index 495afb9aac..0486f7c09b 100644 --- a/loader/ext.c +++ b/loader/ext.c @@ -14,7 +14,7 @@ #include "config.h" #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif #include <unistd.h> diff --git a/loader/qtx/list.c b/loader/qtx/list.c index 34e93dccc5..4669067d30 100644 --- a/loader/qtx/list.c +++ b/loader/qtx/list.c @@ -18,7 +18,7 @@ void* GetProcAddress(void* handle,char* func); #define __cdecl __attribute__((__cdecl__)) #define APIENTRY -int main(int argc, char *argv[]){ +int main(void) { void *handler; ComponentDescription desc; Component (*FindNextComponent)(Component prev,ComponentDescription* desc); diff --git a/loader/qtx/qtxload.c b/loader/qtx/qtxload.c index 0fb13aa9a4..8767559aa1 100644 --- a/loader/qtx/qtxload.c +++ b/loader/qtx/qtxload.c @@ -33,7 +33,7 @@ unsigned int* x_table[0x00001837]; static OSErr (*InitializeQTML)(long flags); -int main(int argc, char *argv[]){ +int main(void) { void *handler; void *handler2; void* theqtdp=NULL; diff --git a/loader/win32.c b/loader/win32.c index 172a91afa9..2ee9f1ea7e 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -53,7 +53,7 @@ for DLL to know too much about its environment. #include <ctype.h> #include <pthread.h> #include <errno.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif #include <time.h> |