[MPlayer-cvslog] CVS: main/libvo vo_gl2.c,1.79,1.80

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv22218

Modified Files:
	vo_gl2.c 
Log Message:
panscan support


Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- vo_gl2.c	25 Sep 2005 16:07:54 -0000	1.79
+++ vo_gl2.c	25 Sep 2005 16:18:16 -0000	1.80
@@ -537,6 +537,9 @@
   {
 	  glClear(GL_COLOR_BUFFER_BIT);
 	  aspect(x, y, A_ZOOM);
+	  panscan_calc();
+	  *x += vo_panscan_x;
+	  *y += vo_panscan_y;
 	  glViewport( (vo_screenwidth-*x)/2, (vo_screenheight-*y)/2, *x, *y);
   } else { 
 	  //aspect(x, y, A_NOZOOM);
@@ -798,6 +801,7 @@
 
 	int_pause = 0;
   
+	panscan_init();
 	aspect_save_orig(width,height);
 	aspect_save_prescale(d_width,d_height);
 	aspect_save_screenres(vo_screenwidth,vo_screenheight);
@@ -1117,6 +1121,11 @@
       initGl(vo_dwidth, vo_dheight);
     resize(&vo_dwidth, &vo_dheight);
     return VO_TRUE;
+  case VOCTRL_GET_PANSCAN:
+    return VO_TRUE;
+  case VOCTRL_SET_PANSCAN:
+    resize (&vo_dwidth, &vo_dheight);
+    return VO_TRUE;
 #ifndef GL_WIN32
   case VOCTRL_SET_EQUALIZER:
     {