[MPlayer-cvslog] CVS: main/libmpcodecs vf_cropdetect.c,1.10,1.11

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv15882

Modified Files:
	vf_cropdetect.c 
Log Message:
x1 and y1 give last used position, must be < width/height


Index: vf_cropdetect.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_cropdetect.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vf_cropdetect.c	2 Sep 2004 20:08:32 -0000	1.10
+++ vf_cropdetect.c	25 Jan 2005 10:07:14 -0000	1.11
@@ -47,8 +47,8 @@
 static int config(struct vf_instance_s* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
-    vf->priv->x1=width;
-    vf->priv->y1=height;
+    vf->priv->x1=width - 1;
+    vf->priv->y1=height - 1;
     vf->priv->x2=0;
     vf->priv->y2=0;
     vf->priv->fno=0;
@@ -109,8 +109,8 @@
     x=(vf->priv->x1+1)&(~1);
     y=(vf->priv->y1+1)&(~1);
     
-    w = vf->priv->x2 - x;
-    h = vf->priv->y2 - y;
+    w = vf->priv->x2 - x + 1;
+    h = vf->priv->y2 - y + 1;
 
     // w and h must be divisible by 2 as well because of yuv
     // colorspace problems.