# HG changeset patch
# User michael
# Date 1064961133 0
# Node ID 0db4771a4fca87f628c1380628a3cb28ec53c3dd
# Parent  9af32c77774d2972b01bd884999e3d8740cab399
rd cbp

diff -r 9af32c77774d -r 0db4771a4fca DOCS/en/mplayer.1
--- a/DOCS/en/mplayer.1	Tue Sep 30 00:53:51 2003 +0000
+++ b/DOCS/en/mplayer.1	Tue Sep 30 22:32:13 2003 +0000
@@ -4102,6 +4102,9 @@
 .RE
 .PD 1
 .TP
+.B cbp\ \ \ \ 
+Rate distorted optimal coded block pattern
+.TP
 .B last_pred=<0\-99>
 Amount of motion predictors from the previous frame
 .PD 0
diff -r 9af32c77774d -r 0db4771a4fca libmpcodecs/ve_lavc.c
--- a/libmpcodecs/ve_lavc.c	Tue Sep 30 00:53:51 2003 +0000
+++ b/libmpcodecs/ve_lavc.c	Tue Sep 30 22:32:13 2003 +0000
@@ -129,6 +129,7 @@
 static int lavc_param_context= 0;
 static char *lavc_param_intra_matrix = NULL;
 static char *lavc_param_inter_matrix = NULL;
+static int lavc_param_cbp= 0;
 
 #include "m_option.h"
 
@@ -224,6 +225,9 @@
 	{"intra_matrix", &lavc_param_intra_matrix, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"inter_matrix", &lavc_param_inter_matrix, CONF_TYPE_STRING, 0, 0, 0, NULL},
 #endif
+#if LIBAVCODEC_BUILD >= 4681
+	{"cbp", &lavc_param_cbp, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD, NULL},
+#endif
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 #endif
@@ -466,6 +470,7 @@
     lavc_venc_context->flags|= lavc_param_umv;
     lavc_venc_context->flags|= lavc_param_v4mv ? CODEC_FLAG_4MV : 0;
     lavc_venc_context->flags|= lavc_param_data_partitioning;
+    lavc_venc_context->flags|= lavc_param_cbp;
     if(lavc_param_gray) lavc_venc_context->flags|= CODEC_FLAG_GRAY;
 
     if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP;