diff options
| -rw-r--r-- | cfg-common.h | 8 | ||||
| -rw-r--r-- | cfg-mplayer.h | 7 | ||||
| -rw-r--r-- | mencoder.c | 7 |
3 files changed, 15 insertions, 7 deletions
diff --git a/cfg-common.h b/cfg-common.h index 89b2b37b07..8f28101a36 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -101,6 +101,14 @@ {"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, {"vop", &vo_plugin_args, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, + {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL}, + {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL}, + {"aspect", &movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL}, + {"noaspect", &movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, NULL}, + {"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, + // ------------------------- subtitles options -------------------- #ifdef USE_SUB diff --git a/cfg-mplayer.h b/cfg-mplayer.h index f7b3236c49..dc9696872d 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -234,20 +234,13 @@ static config_t mplayer_opts[]={ #endif {"x", &opt_screen_size_x, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, {"y", &opt_screen_size_y, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, - {"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, {"screenw", &vo_screenwidth, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, {"screenh", &vo_screenheight, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, - {"aspect", &movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL}, - {"noaspect", &movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, NULL}, {"monitoraspect", &monitor_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL}, {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0, NULL}, - {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0, NULL}, - {"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL}, - {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL}, {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32, NULL}, {"fsmode", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 15, NULL}, diff --git a/mencoder.c b/mencoder.c index 6364604f90..a5cdb1a831 100644 --- a/mencoder.c +++ b/mencoder.c @@ -90,6 +90,13 @@ char *video_codec=NULL; // override video codec int audio_family=-1; // override audio codec family int video_family=-1; // override video codec family +// libvo opts: (defiend at libmpcodecs/vd.c) +extern int screen_size_xy; +extern float movie_aspect; +extern int softzoom; +extern int flip; + + #ifdef HAVE_MP3LAME int out_audio_codec=ACODEC_VBRMP3; #else |