[MPlayer-cvslog] CVS: main/libmpcodecs ve_x264.c,1.14,1.15

[Loren Merritt CVS]

CVS change done by Loren Merritt CVS

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

Modified Files:
	ve_x264.c 
Log Message:
sync to x264 r129: modified ratecontrol equation.


Index: ve_x264.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ve_x264.c	12 Jan 2005 09:54:56 -0000	1.14
+++ ve_x264.c	17 Feb 2005 19:32:44 -0000	1.15
@@ -49,7 +49,7 @@
 
 #include <x264.h>
 
-#if X264_BUILD < 0x000e
+#if X264_BUILD < 0x0010
 #error We do not support old versions of x264. Get the latest from SVN.
 #endif
 
@@ -90,7 +90,7 @@
 static float qcomp = 0.6;
 static float qblur = 0.5;
 static float complexity_blur = 20;
-static char *rc_eq = "tex*blurTex^(qComp-1)";
+static char *rc_eq = "blurCplx^(1-qComp)";
 static int subq = 5;
 static int psnr = 0;
 static int log_level = 2;