diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-08-10 21:25:20 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-08-10 21:25:20 +0000 |
| commit | e19962f736e9a0a7541314d4293c3158794d5f47 (patch) | |
| tree | 674c1cceb6222e7152b57ee0cd282e5cfa94f8e7 /src/video_out/video_out_opengl.c | |
| parent | 6235752f3a263fb44fdbc8dca6aaa096a813ce6c (diff) | |
| download | xine-lib-e19962f736e9a0a7541314d4293c3158794d5f47.tar.gz xine-lib-e19962f736e9a0a7541314d4293c3158794d5f47.tar.bz2 | |
syncing my local tree:
- removes w32codec syncshutdown hack
- vo_driver api changed to support drivers with persistent overlays. that
will break binary compatibility xine-lib/xine-ui (xine-ui needs to be
recompiled). in order to keep binary compatibility
overlay_begin/overlay_end must be added after redraw_needed.
- video_overlay cleanups
- fix a hard to trigger condition where redraw wouldn't happen (freeing
handles)
CVS patchset: 2427
CVS date: 2002/08/10 21:25:20
Diffstat (limited to 'src/video_out/video_out_opengl.c')
| -rw-r--r-- | src/video_out/video_out_opengl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 5a06fbac4..c4ba278ef 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_opengl.c,v 1.15 2002/07/16 19:33:37 esnel Exp $ + * $Id: video_out_opengl.c,v 1.16 2002/08/10 21:25:20 miguelfreitas Exp $ * * video_out_glut.c, glut based OpenGL rendering interface for xine * Matthias Hopf <mat@mshopf.de> @@ -1077,7 +1077,9 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { this->vo_driver.get_capabilities = opengl_get_capabilities; this->vo_driver.alloc_frame = opengl_alloc_frame; this->vo_driver.update_frame_format = opengl_update_frame_format; + this->vo_driver.overlay_begin = NULL; /* not used */ this->vo_driver.overlay_blend = opengl_overlay_blend; + this->vo_driver.overlay_end = NULL; /* not used */ this->vo_driver.display_frame = opengl_display_frame; this->vo_driver.get_property = opengl_get_property; this->vo_driver.set_property = opengl_set_property; @@ -1099,7 +1101,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { } static vo_info_t vo_info_shm = { - 5, + 6, "OpenGL", NULL, VISUAL_TYPE_X11, |