# HG changeset patch
# User reimar
# Date 1303453723 0
# Node ID 107d32318fa03e5dd214d1bad73a51f27e4d689f
# Parent  32238139a2ff7699282c935030e16d8dc6fee57a
Remove obsolete options, fixes compilation with latest FFmpeg.

diff -r 32238139a2ff -r 107d32318fa0 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Fri Apr 22 06:19:14 2011 +0000
+++ b/DOCS/man/en/mplayer.1	Fri Apr 22 06:28:43 2011 +0000
@@ -8512,14 +8512,6 @@
 Maximum quantizer, 10\-31 should be a sane range (default: 31).
 .
 .TP
-.B mbqmin=<1\-31>
-obsolete, use vqmin
-.
-.TP
-.B mbqmax=<1\-31>
-obsolete, use vqmax
-.
-.TP
 .B vqdiff=<1\-31>
 maximum quantizer difference between consecutive I- or P-frames
 (default: 3)
diff -r 32238139a2ff -r 107d32318fa0 libmpcodecs/ve_lavc.c
--- a/libmpcodecs/ve_lavc.c	Fri Apr 22 06:19:14 2011 +0000
+++ b/libmpcodecs/ve_lavc.c	Fri Apr 22 06:28:43 2011 +0000
@@ -64,8 +64,6 @@
 static float lavc_param_vqscale = -1;
 static int lavc_param_vqmin = 2;
 static int lavc_param_vqmax = 31;
-static int lavc_param_mb_qmin = 2;
-static int lavc_param_mb_qmax = 31;
 static float lavc_param_lmin = 2;
 static float lavc_param_lmax = 31;
 static float lavc_param_mb_lmin = 2;
@@ -199,8 +197,6 @@
 	{"vqscale", &lavc_param_vqscale, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 255.0, NULL},
 	{"vqmin", &lavc_param_vqmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
 	{"vqmax", &lavc_param_vqmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
-	{"mbqmin", &lavc_param_mb_qmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
-	{"mbqmax", &lavc_param_mb_qmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
 	{"lmin", &lavc_param_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
 	{"lmax", &lavc_param_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
 	{"mblmin", &lavc_param_mb_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
@@ -377,8 +373,6 @@
     lavc_venc_context->time_base= (AVRational){mux_v->h.dwScale, mux_v->h.dwRate};
     lavc_venc_context->qmin= lavc_param_vqmin;
     lavc_venc_context->qmax= lavc_param_vqmax;
-    lavc_venc_context->mb_qmin= lavc_param_mb_qmin;
-    lavc_venc_context->mb_qmax= lavc_param_mb_qmax;
     lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
     lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
     lavc_venc_context->mb_lmin= (int)(FF_QP2LAMBDA * lavc_param_mb_lmin + 0.5);