summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-28 05:01:09 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-28 05:01:09 +0000
commit1023cef0c8b7452022869f91ba1d2d93145f57ef (patch)
tree37fe541a425fe5f54e108a8612a85e5732341c80
parentcbe1cd16575479f01b52f33c0c6abc448c3c1b2c (diff)
downloadmpv-1023cef0c8b7452022869f91ba1d2d93145f57ef.tar.bz2
mpv-1023cef0c8b7452022869f91ba1d2d93145f57ef.tar.xz
libavcodec 4mv support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5377 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--cfg-mencoder.h1
-rw-r--r--mencoder.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h
index 60e8187e47..37d54de603 100644
--- a/cfg-mencoder.h
+++ b/cfg-mencoder.h
@@ -54,6 +54,7 @@ struct config lavcopts_conf[]={
{"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},
+ {"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},
{"vqmin", &lavc_param_vqmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
diff --git a/mencoder.c b/mencoder.c
index cad2cdd3b2..bab2f24ba4 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -76,6 +76,7 @@ char *lavc_param_vcodec = NULL;
int lavc_param_vbitrate = -1;
int lavc_param_vrate_tolerance = 1024*8;
int lavc_param_vhq = 0; /* default is realtime encoding */
+int lavc_param_v4mv = 0;
int lavc_param_vme = 3;
int lavc_param_vqscale = 0;
int lavc_param_vqmin = 3;
@@ -1193,7 +1194,6 @@ case VCODEC_LIBAVCODEC:
else
lavc_venc_context.gop_size = 250; /* default */
- /* ignored by libavcodec? */
if (lavc_param_vhq)
{
printf("High quality encoding selected (non real time)!\n");
@@ -1202,6 +1202,8 @@ case VCODEC_LIBAVCODEC:
else
lavc_venc_context.flags = 0;
+ lavc_venc_context.flags|= lavc_param_v4mv ? CODEC_FLAG_4MV : 0;
+
/* motion estimation (0 = none ... 3 = high quality but slow) */
/* this is just an extern from libavcodec but it should be in the
encoder context - FIXME */