diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-25 02:14:16 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-25 02:50:58 +0300 |
| commit | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (patch) | |
| tree | 1ba215c9978eadcd6b99b2c696b22ea6a3779e33 /libvo/vo_gl2.c | |
| parent | 577587ec6ce8dad59c303a76cba03af03db879a3 (diff) | |
| parent | 901574e3bf6ff45a46a12dc7884a93970f9d58d1 (diff) | |
| download | mpv-3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d.tar.bz2 mpv-3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d.tar.xz | |
Merge svn changes up to r27347
Conflicts:
libvo/x11_common.c
libvo/x11_common.h
Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts
with the global variable "vo_border"; done in the merge commit because
uses of the macro needed changes anyway to resolve conflicts.
Diffstat (limited to 'libvo/vo_gl2.c')
| -rw-r--r-- | libvo/vo_gl2.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index 68885c37c2..9af9b255c5 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -889,11 +889,9 @@ static int control(uint32_t request, void *data) initGl(vo_dwidth, vo_dheight); resize(&vo_dwidth, &vo_dheight); return VO_TRUE; -#ifdef GL_WIN32 case VOCTRL_BORDER: - vo_w32_border(); + vo_gl_border(global_vo); return VO_TRUE; -#endif case VOCTRL_GET_PANSCAN: return VO_TRUE; case VOCTRL_SET_PANSCAN: |