[Mplayer-cvslog] CVS: main/libmpcodecs pullup.c,1.18,1.19

[Richard Felker CVS]

CVS change done by Richard Felker CVS

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

Modified Files:
	pullup.c 
Log Message:
strictness level -1 to 'almost' ignore breaks

Index: pullup.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/pullup.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pullup.c	2 Sep 2004 23:51:05 -0000	1.18
+++ pullup.c	3 Sep 2004 00:08:58 -0000	1.19
@@ -480,15 +480,19 @@
 	struct pullup_field *f1 = f0->next;
 	struct pullup_field *f2 = f1->next;
 	struct pullup_field *f3 = f2->next;
+	int l;
 	
 	if (queue_length(c->first, c->last) < 6) return 0;
 	foo(c);
 
 	if (f0->affinity == -1) return 1;
 
-	switch (find_first_break(f0, 3)) {
+	l = find_first_break(f0, 3);
+	if (l == 1 && c->strict_breaks < 0) l = 0;
+	
+	switch (l) {
 	case 1:
-		if (!c->strict_breaks && f0->affinity == 1 && f1->affinity == -1)
+		if (c->strict_breaks > 0 && f0->affinity == 1 && f1->affinity == -1)
 			return 2;
 		else return 1;
 	case 2: