# HG changeset patch
# User lorenm
# Date 1132636637 0
# Node ID 8e458f513c4880128bbbe18348ab81c16911c49d
# Parent  c20b4b1d0676a1e791180379b433a25499b85994
sync to x264 r373 (brdo)

diff -r c20b4b1d0676 -r 8e458f513c48 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Mon Nov 21 23:51:27 2005 +0000
+++ b/DOCS/man/en/mplayer.1	Tue Nov 22 05:17:17 2005 +0000
@@ -8757,6 +8757,11 @@
 Requires frameref>1.
 .
 .TP
+.B (no)brdo
+Enables rate-distortion optimization of macroblock types in B-frames.
+Requires subq=6.
+.
+.TP
 .B trellis=<0\-2>
 rate-distortion optimal quantization
 .PD 0
@@ -8791,9 +8796,6 @@
 .RE
 .RS
 .I NOTE:
-Files encoded using CQMs are not currently decodable by FFmpeg-based
-players.
-.br
 Windows CMD.EXE users may experience problems with parsing the command line
 if they attempt to use all the CQM lists.
 This is due to a command line length limitation.
@@ -8834,7 +8836,7 @@
 .TP
 .B level_idc=<10\-51>
 Set the bitstream's level as defined by annex A of the H.264 standard
-(default: 40 - Level 4.0).
+(default: 51 - Level 5.1).
 This is used for telling the decoder what capabilities it needs to support.
 Use this parameter only if you know what it means,
 and you have a need to set it.
diff -r c20b4b1d0676 -r 8e458f513c48 configure
--- a/configure	Mon Nov 21 23:51:27 2005 +0000
+++ b/configure	Tue Nov 22 05:17:17 2005 +0000
@@ -6223,7 +6223,7 @@
 cat > $TMPC << EOF
 #include <inttypes.h>
 #include <x264.h>
-#if X264_BUILD < 39
+#if X264_BUILD < 40
 #error We do not support old versions of x264. Get the latest from SVN.
 #endif
 int main(void) { x264_encoder_open((void*)0); return 0; }
diff -r c20b4b1d0676 -r 8e458f513c48 libmpcodecs/ve_x264.c
--- a/libmpcodecs/ve_x264.c	Mon Nov 21 23:51:27 2005 +0000
+++ b/libmpcodecs/ve_x264.c	Tue Nov 22 05:17:17 2005 +0000
@@ -100,6 +100,7 @@
 static char *rc_eq = "blurCplx^(1-qComp)";
 static char *zones = NULL;
 static int subq = 5;
+static int bframe_rdo = 0;
 static int me_method = 2;
 static int me_range = 16;
 static int trellis = 1;
@@ -181,6 +182,8 @@
     {"cplx_blur", &complexity_blur, CONF_TYPE_FLOAT, CONF_RANGE, 0, 999, NULL},
     {"zones", &zones, CONF_TYPE_STRING, 0, 0, 0, NULL},
     {"subq", &subq, CONF_TYPE_INT, CONF_RANGE, 1, 6, NULL},
+    {"brdo", &bframe_rdo, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+    {"nobrdo", &bframe_rdo, CONF_TYPE_FLAG, 0, 0, 0, NULL},
     {"me", &me_method, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},
     {"me_range", &me_range, CONF_TYPE_INT, CONF_RANGE, 4, 64, NULL},
     {"trellis", &trellis, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
@@ -292,6 +295,7 @@
     mod->param.analyse.b_chroma_me = chroma_me;
     mod->param.analyse.b_mixed_references = mixed_references;
     mod->param.analyse.i_trellis = trellis;
+    mod->param.analyse.b_bframe_rdo = bframe_rdo;
 
     mod->param.i_width = width;
     mod->param.i_height = height;