diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 18:59:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 18:59:15 +0200 |
| commit | b0986b3760b0174be6a58e1754353102f3230c79 (patch) | |
| tree | 0c9f5a05216a547ae4ddf3b2669749f88ec3f801 /libvo | |
| parent | 5fc54a6caad5f24b993da2e282c896269a6abc49 (diff) | |
| parent | 23db422c3d40a5202d61b5ca154cf5286d9ac0a5 (diff) | |
| download | mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.bz2 mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.xz | |
Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/gl_common.c | 2 | ||||
| -rw-r--r-- | libvo/osx_common.h | 23 |
2 files changed, 24 insertions, 1 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index a411c00eb2..ce65873349 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -442,7 +442,7 @@ static const extfunc_desc_t extfuncs[] = { {&ProgramString, "_program", {"glProgramStringARB", NULL}}, {&GetProgramiv, "_program", {"glGetProgramivARB", NULL}}, {&ProgramEnvParameter4f, "_program", {"glProgramEnvParameter4fARB", NULL}}, - {&SwapInterval, "_swap_control", {"glXSwapInterval", "glXSwapIntervalSGI", "wglSwapInterval", "wglSwapIntervalEXT", "wglSwapIntervalSGI", NULL}}, + {&SwapInterval, "_swap_control", {"glXSwapIntervalSGI", "glXSwapInterval", "wglSwapIntervalSGI", "wglSwapInterval", "wglSwapIntervalEXT", NULL}}, {&TexImage3D, NULL, {"glTexImage3D", NULL}}, {&AllocateMemoryMESA, "GLX_MESA_allocate_memory", {"glXAllocateMemoryMESA", NULL}}, {&FreeMemoryMESA, "GLX_MESA_allocate_memory", {"glXFreeMemoryMESA", NULL}}, diff --git a/libvo/osx_common.h b/libvo/osx_common.h index ce598240c2..d20698e411 100644 --- a/libvo/osx_common.h +++ b/libvo/osx_common.h @@ -1,3 +1,26 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_OSX_COMMON_H +#define MPLAYER_OSX_COMMON_H + int convert_key(unsigned key, unsigned charcode); void change_movie_aspect(float new_aspect); void config_movie_aspect(float config_aspect); + +#endif /* MPLAYER_OSX_COMMON_H */ |