[MPlayer-cvslog] CVS: main/libmpcodecs ve_x264.c,1.46,1.47

[Loren Merritt CVS]

CVS change done by Loren Merritt CVS

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

Modified Files:
	ve_x264.c 
Log Message:
sync to x264 r457 (direct_pred=3)



Index: ve_x264.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ve_x264.c	21 Feb 2006 09:39:21 -0000	1.46
+++ ve_x264.c	5 Mar 2006 07:23:12 -0000	1.47
@@ -77,7 +77,7 @@
 static int i8x8 = 1;
 static int i4x4 = 1;
 static int dct8 = 0;
-static int direct_pred = X264_DIRECT_PRED_TEMPORAL;
+static int direct_pred = X264_DIRECT_PRED_SPATIAL;
 static int weight_b = 0;
 static int chroma_me = 1;
 static int mixed_references = 0;
@@ -152,7 +152,7 @@
     {"noi8x8", &i8x8, CONF_TYPE_FLAG, 0, 0, 0, NULL},
     {"8x8dct", &dct8, CONF_TYPE_FLAG, 0, 0, 1, NULL},
     {"no8x8dct", &dct8, CONF_TYPE_FLAG, 0, 0, 0, NULL},
-    {"direct_pred", &direct_pred, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
+    {"direct_pred", &direct_pred, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
     {"weight_b", &weight_b, CONF_TYPE_FLAG, 0, 0, 1, NULL},
     {"noweight_b", &weight_b, CONF_TYPE_FLAG, 0, 1, 0, NULL},
     {"bime", &bidir_me, CONF_TYPE_FLAG, 0, 0, 1, NULL},