From 269f7df18bcb01229429690dfdbbcdf98369814a Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 15 Nov 2012 18:53:51 +0100 Subject: options: --field-dominance: replace magic number values with choices --field-dominance=-1 becomes --field-dominance=auto --field-dominance=0 becomes --field-dominance=top --field-dominance=1 becomes --field-dominance=bottom --- DOCS/man/en/options.rst | 13 ++++++------- core/cfg-mplayer.h | 3 ++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 7cc309de02..97171a8c42 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -528,15 +528,14 @@ reliable enough), the filename extension is used to select the demuxer. Always falls back on content-based demuxer selection. ---field-dominance=<-1-1> +--field-dominance= Set first field for interlaced content. Useful for deinterlacers that - double the framerate: ``--vf=tfields=1``, ``--vf=yadif=1`` and - ``--vo=vdpau:deint``. + double the framerate: ``--vf=yadif=1`` and ``--vo=vdpau:deint``. - :-1: auto (default): If the decoder does not export the appropriate - information, it falls back to 0 (top field first). - :0: top field first - :1: bottom field first + :auto: (default) If the decoder does not export the appropriate + information, it falls back to 0 (top field first). + :top: top field first + :bottom: bottom field first --no-fixed-vo, --fixed-vo ``--no-fixed-vo`` enforces closing and reopening the video window for diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index b6e947be5f..a83c16d271 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -489,7 +489,8 @@ const m_option_t common_opts[] = { OPT_MAKE_FLAGS("slices", vd_use_slices, 0), // use (probably completely broken) decoder direct rendering OPT_MAKE_FLAGS("dr1", vd_use_dr1, 0), - {"field-dominance", &field_dominance, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL}, + {"field-dominance", &field_dominance, CONF_TYPE_CHOICE, 0, + M_CHOICES(({"auto", -1}, {"top", 0}, {"bottom", 1}))}, {"lavdopts", (void *) lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, {"lavfdopts", (void *) lavfdopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, -- cgit v1.2.3