summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-07-29 02:29:58 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-07-29 02:29:58 +0000
commitc46b19bbe80cba813dfe86a695cfd9d27be42735 (patch)
tree9150a4b205df75276b27795c68efe4833379b03a /libmpcodecs
parentb8650f660d9184d4c7cac89539dcb628f683b15a (diff)
downloadmpv-c46b19bbe80cba813dfe86a695cfd9d27be42735.tar.bz2
mpv-c46b19bbe80cba813dfe86a695cfd9d27be42735.tar.xz
mb decision stuff
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10499 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ve_lavc.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c
index 28d303af52..8511914e71 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -55,7 +55,7 @@ extern int avcodec_inited;
static char *lavc_param_vcodec = "mpeg4";
static int lavc_param_vbitrate = -1;
static int lavc_param_vrate_tolerance = 1000*8;
-static int lavc_param_vhq = 0; /* default is realtime encoding */
+static int lavc_param_mb_decision = 0; /* default is realtime encoding */
static int lavc_param_v4mv = 0;
static int lavc_param_vme = 4;
static int lavc_param_vqscale = 0;
@@ -135,7 +135,8 @@ struct config lavcopts_conf[]={
{"vcodec", &lavc_param_vcodec, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"vbitrate", &lavc_param_vbitrate, CONF_TYPE_INT, CONF_RANGE, 4, 24000000, NULL},
{"vratetol", &lavc_param_vrate_tolerance, CONF_TYPE_INT, CONF_RANGE, 4, 24000000, NULL},
- {"vhq", &lavc_param_vhq, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"vhq", &lavc_param_mb_decision, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"mbd", &lavc_param_mb_decision, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
{"v4mv", &lavc_param_v4mv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"vme", &lavc_param_vme, CONF_TYPE_INT, CONF_RANGE, 0, 5, NULL},
{"vqscale", &lavc_param_vqscale, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
@@ -386,13 +387,16 @@ static int config(struct vf_instance_s* vf,
else
lavc_venc_context->gop_size = 250; /* default */
- if (lavc_param_vhq)
+ lavc_venc_context->flags = 0;
+ if (lavc_param_mb_decision)
{
printf("High quality encoding selected (non real time)!\n");
- lavc_venc_context->flags = CODEC_FLAG_HQ;
+#if LIBAVCODEC_BUILD < 4673
+ lavc_venc_context->flags = CODEC_FLAG_HQ;
+#else
+ lavc_venc_context->mb_decision= lavc_param_mb_decision;
+#endif
}
- else
- lavc_venc_context->flags = 0;
#if LIBAVCODEC_BUILD >= 4647
lavc_venc_context->me_cmp= lavc_param_me_cmp;