summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-14 23:59:43 +0200
committerwm4 <wm4@nowhere>2013-08-19 12:55:53 +0200
commit67704e2977d2bb5c35f962b154d5e8e481e2d508 (patch)
tree553e02586c4d0a0847067c999e4f3947a8d0dd1e
parent4579cce768d0c9c84dc5f318b7189ffb03b49ece (diff)
downloadmpv-67704e2977d2bb5c35f962b154d5e8e481e2d508.tar.bz2
mpv-67704e2977d2bb5c35f962b154d5e8e481e2d508.tar.xz
options: remove --panscanrange option
This option allowed you to extend the range of the panscan controls, so that you could essentially use it to scale the video. This will be replaced by a separate option to set the zoom factor directly.
-rw-r--r--DOCS/man/en/options.rst8
-rw-r--r--mpvcore/options.c2
-rw-r--r--mpvcore/options.h1
-rw-r--r--video/out/aspect.c11
4 files changed, 3 insertions, 19 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 21e4a7991a..210f89381b 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1485,14 +1485,6 @@
controls how much of the image is cropped. May not work with all video
output drivers.
-``--panscanrange=<-19.0-99.0>``
- (experimental)
- Change the range of the pan-and-scan functionality (default: 1). Positive
- values mean multiples of the default range. Negative numbers mean you can
- zoom in up to a factor of ``--panscanrange=+1``. E.g. ``--panscanrange=-3``
- allows a zoom factor of up to 4. This feature is experimental. Do not
- report bugs unless you are using ``--vo=opengl``.
-
``--playing-msg=<string>``
Print out a string after starting playback. The string is expanded for
properties, e.g. ``--playing-msg=file: ${filename}`` will print the string
diff --git a/mpvcore/options.c b/mpvcore/options.c
index 727a3313df..5600ccee71 100644
--- a/mpvcore/options.c
+++ b/mpvcore/options.c
@@ -581,7 +581,6 @@ const m_option_t mp_opts[] = {
OPT_INTRANGE("fsmode-dontuse", vo.fsmode, 0, 31, 4096),
OPT_FLAG("native-keyrepeat", vo.native_keyrepeat, 0),
OPT_FLOATRANGE("panscan", vo.panscan, 0, 0.0, 1.0),
- OPT_FLOATRANGE("panscanrange", vo.panscanrange, 0, -19.0, 99.0),
OPT_FLAG("force-rgba-osd-rendering", force_rgba_osd, 0),
OPT_CHOICE("colormatrix", requested_colorspace, 0,
({"auto", MP_CSP_AUTO},
@@ -747,7 +746,6 @@ const struct MPOpts mp_default_opts = {
.video_driver_list = NULL,
.cursor_autohide_delay = 1000,
.monitor_pixel_aspect = 1.0,
- .panscanrange = 1.0,
.screen_id = -1,
.fsscreen_id = -1,
.nomouse_input = 0,
diff --git a/mpvcore/options.h b/mpvcore/options.h
index 8487c84cc5..2ab9e517a0 100644
--- a/mpvcore/options.h
+++ b/mpvcore/options.h
@@ -19,7 +19,6 @@ typedef struct mp_vo_opts {
int native_keyrepeat;
float panscan;
- float panscanrange;
struct m_geometry geometry;
struct m_geometry autofit;
diff --git a/video/out/aspect.c b/video/out/aspect.c
index aa2e6e64d8..a5a1f09786 100644
--- a/video/out/aspect.c
+++ b/video/out/aspect.c
@@ -96,14 +96,9 @@ void aspect_calc_panscan(struct vo *vo, int *out_w, int *out_h)
int fwidth, fheight;
aspect_calc(vo, &fwidth, &fheight);
- int vo_panscan_area;
- if (opts->panscanrange > 0) {
- vo_panscan_area = vo->dheight - fheight;
- if (!vo_panscan_area)
- vo_panscan_area = vo->dwidth - fwidth;
- vo_panscan_area *= opts->panscanrange;
- } else
- vo_panscan_area = -opts->panscanrange * vo->dheight;
+ int vo_panscan_area = vo->dheight - fheight;
+ if (!vo_panscan_area)
+ vo_panscan_area = vo->dwidth - fwidth;
*out_w = fwidth + vo_panscan_area * opts->panscan * fwidth / fheight;
*out_h = fheight + vo_panscan_area * opts->panscan;