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/qtx/qtxload.c | |
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/qtx/qtxload.c')
-rw-r--r-- | loader/qtx/qtxload.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |