Mercurial > mplayer.hg
changeset 5904:c37b0c8a9d4c
-xy,-zoom,-flip available in mencoder too
| author | arpi |
|---|---|
| date | Mon, 29 Apr 2002 20:07:53 +0000 |
| parents | 97abdfbbeff0 |
| children | 1edc3e2b74d3 |
| files | cfg-common.h cfg-mplayer.h mencoder.c |
| diffstat | 3 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-common.h Mon Apr 29 20:05:11 2002 +0000 +++ b/cfg-common.h Mon Apr 29 20:07:53 2002 +0000 @@ -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
--- a/cfg-mplayer.h Mon Apr 29 20:05:11 2002 +0000 +++ b/cfg-mplayer.h Mon Apr 29 20:07:53 2002 +0000 @@ -234,20 +234,13 @@ #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},
--- a/mencoder.c Mon Apr 29 20:05:11 2002 +0000 +++ b/mencoder.c Mon Apr 29 20:07:53 2002 +0000 @@ -90,6 +90,13 @@ 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