Mercurial > mplayer.hg
annotate libvo/gl_common.h @ 13940:8b38ccbfe2dc
Sync with 1.805:
1.805: allow forcing of software volume control and setting maximum
amplification.
1.804: update description of lavc's keyint, vb_strategy, and mbqmin.
1.803 (done by Diego)
1.802: Mention unichrome_vid in the list of VIDIX drivers
patch by Timothy Lee <timothy dot lee at siriushk dot com>
author | gpoirier |
---|---|
date | Sun, 14 Nov 2004 14:27:51 +0000 |
parents | ae1dfa5bc2e1 |
children | c4033dcb986f |
rev | line source |
---|---|
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
1 #ifndef __GL_COMMON_H__ |
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
2 #define __GL_COMMON_H__ |
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
3 |
13843 | 4 #include "mp_msg.h" |
5 #include "config.h" | |
6 | |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
7 #include <GL/gl.h> |
13843 | 8 #include "video_out.h" |
9 | |
10 #ifndef GL_WIN32 | |
11 #include <X11/Xlib.h> | |
12 #include <GL/glx.h> | |
13 #include "x11_common.h" | |
14 #endif | |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
15 |
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
16 void glAdjustAlignment(int stride); |
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
17 |
13843 | 18 //! could not set new window, will continue drawing into the old one. |
19 #define SET_WINDOW_FAILED -1 | |
20 //! new window is set, could even transfer the OpenGL context. | |
21 #define SET_WINDOW_OK 0 | |
22 //! new window is set, but the OpenGL context needs to be reinitialized. | |
23 #define SET_WINDOW_REINIT 1 | |
24 | |
25 #ifndef GL_WIN32 | |
26 int setGlWindow(XVisualInfo **vinfo, GLXContext *context, Window win); | |
13921 | 27 void releaseGlContext(XVisualInfo **vinfo, GLXContext *context); |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
28 #endif |
13843 | 29 |
30 #endif |