summaryrefslogtreecommitdiff
path: root/src/video_out/video_out_syncfb.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-08-10 21:25:20 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-08-10 21:25:20 +0000
commite19962f736e9a0a7541314d4293c3158794d5f47 (patch)
tree674c1cceb6222e7152b57ee0cd282e5cfa94f8e7 /src/video_out/video_out_syncfb.c
parent6235752f3a263fb44fdbc8dca6aaa096a813ce6c (diff)
downloadxine-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_syncfb.c')
-rw-r--r--src/video_out/video_out_syncfb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index 8fcb91e41..07ab6e82b 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.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_syncfb.c,v 1.73 2002/07/15 21:42:34 esnel Exp $
+ * $Id: video_out_syncfb.c,v 1.74 2002/08/10 21:25:20 miguelfreitas Exp $
*
* video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine
*
@@ -1151,7 +1151,9 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen)
this->vo_driver.get_capabilities = syncfb_get_capabilities;
this->vo_driver.alloc_frame = syncfb_alloc_frame;
this->vo_driver.update_frame_format = syncfb_update_frame_format;
+ this->vo_driver.overlay_begin = NULL; /* not used */
this->vo_driver.overlay_blend = syncfb_overlay_blend;
+ this->vo_driver.overlay_end = NULL; /* not used */
this->vo_driver.display_frame = syncfb_display_frame;
this->vo_driver.get_property = syncfb_get_property;
this->vo_driver.set_property = syncfb_set_property;
@@ -1164,7 +1166,7 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen)
}
static vo_info_t vo_info_syncfb = {
- 5,
+ 6,
"SyncFB",
NULL,
VISUAL_TYPE_X11,