summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-02-17 19:32:44 +0000
committerlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-02-17 19:32:44 +0000
commit31bb03baaae3d6932f570ab2d2ca143d85f6114f (patch)
treea438879aa8590e87ea9a6e6e3b564de32db4b128 /libmpcodecs
parentf47114f9324212ea0c04c55b3d7b9fa6852fdd50 (diff)
downloadmpv-31bb03baaae3d6932f570ab2d2ca143d85f6114f.tar.bz2
mpv-31bb03baaae3d6932f570ab2d2ca143d85f6114f.tar.xz
sync to x264 r129: modified ratecontrol equation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14720 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ve_x264.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index c48bb71955..bbf6aa6372 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -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 int pass = 0;
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;