[Mplayer-cvslog] CVS: main/libmpcodecs vf_pullup.c,1.7,1.8

[Richard Felker CVS]

CVS change done by Richard Felker CVS

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

Modified Files:
	vf_pullup.c 
Log Message:
configurable 'junk' borders for pullup

Index: vf_pullup.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_pullup.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vf_pullup.c	10 Jun 2004 05:06:34 -0000	1.7
+++ vf_pullup.c	10 Jun 2004 05:20:50 -0000	1.8
@@ -80,11 +80,6 @@
 		c->metric_plane = 0;
 	}
 
-	c->strict_breaks = 0;
-	c->junk_left = c->junk_right = 1;
-	c->junk_top = c->junk_bottom = 4;
-	c->verbose = verbose;
-
 	if (gCpuCaps.hasMMX) c->cpu |= PULLUP_CPU_MMX;
 	if (gCpuCaps.hasMMX2) c->cpu |= PULLUP_CPU_MMX2;
 	if (gCpuCaps.has3DNow) c->cpu |= PULLUP_CPU_3DNOW;
@@ -315,6 +310,7 @@
 static int open(vf_instance_t *vf, char* args)
 {
 	struct vf_priv_s *p;
+	struct pullup_context *c;
 	vf->get_image = get_image;
 	vf->put_image = put_image;
 	vf->config = config;
@@ -322,8 +318,15 @@
 	vf->uninit = uninit;
 	vf->default_reqs = VFCAP_ACCEPT_STRIDE;
 	vf->priv = p = calloc(1, sizeof(struct vf_priv_s));
-	p->ctx = pullup_alloc_context();
+	p->ctx = c = pullup_alloc_context();
 	p->fakecount = 2;
+	c->verbose = verbose;
+	c->junk_left = c->junk_right = 1;
+	c->junk_top = c->junk_bottom = 4;
+	c->strict_breaks = 0;
+	if (args) {
+		sscanf(args, "%d:%d:%d:%d:%d", &c->junk_left, &c->junk_right, &c->junk_top, &c->junk_bottom, &c->strict_breaks);
+	}
 	return 1;
 }