summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Courtier-Dutton <jcdutton@users.sourceforge.net>2002-01-10 15:31:26 +0000
committerJames Courtier-Dutton <jcdutton@users.sourceforge.net>2002-01-10 15:31:26 +0000
commitf774df718535ffe3bb5a850a8b2092a5e3611614 (patch)
treebd31b857188b5c45b9a6c0c9bb8dec6a7dc0b400
parentd0dda56ad1f8f852455d87b2570f40c9dda10a36 (diff)
downloadxine-lib-f774df718535ffe3bb5a850a8b2092a5e3611614.tar.gz
xine-lib-f774df718535ffe3bb5a850a8b2092a5e3611614.tar.bz2
Forgot to update xine.h.tmpl.in with the new video_out api.
CVS patchset: 1384 CVS date: 2002/01/10 15:31:26
-rw-r--r--include/xine.h.tmpl.in7
-rw-r--r--src/video_out/video_out_xshm.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in
index 3e9f59dd9..986066d4a 100644
--- a/include/xine.h.tmpl.in
+++ b/include/xine.h.tmpl.in
@@ -28,7 +28,7 @@
\endverbatim
*/
/*
- * $Id: xine.h.tmpl.in,v 1.73 2002/01/08 16:47:56 cvogler Exp $
+ * $Id: xine.h.tmpl.in,v 1.74 2002/01/10 15:31:26 jcdutton Exp $
*
*/
@@ -476,6 +476,11 @@ struct vo_driver_s {
*/
void (*exit) (vo_driver_t *self);
+ /**
+ * Get driver name etc.
+ */
+ vo_info_t* (*get_info) ();
+
};
/** @} end of video_group */
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index b308ff16a..75df132b1 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.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_xshm.c,v 1.53 2002/01/09 22:33:04 jcdutton Exp $
+ * $Id: video_out_xshm.c,v 1.54 2002/01/10 15:31:26 jcdutton Exp $
*
* video_out_xshm.c, X11 shared memory extension interface for xine
*
@@ -1035,7 +1035,7 @@ static int xshm_gui_data_exchange (vo_driver_t *this_gen,
if (xev->count == 0) {
XLockDisplay (this->display);
-
+
xoffset = (this->gui_width - this->cur_frame->rgb_width) / 2;
yoffset = (this->gui_height - this->cur_frame->rgb_height) / 2;