From 6f5e5e6a9e9f1534282bdf21110bab980cc22164 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 20 Jan 2015 14:33:53 +0100
Subject: vo_opengl: remove cscale-down suboption

For an explanation see the additions to the manpage.
---
 video/out/gl_video.c | 10 +++++-----
 video/out/gl_video.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'video')

diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 8f4f7e8cbd..e991c85857 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -361,8 +361,7 @@ const struct m_sub_options gl_video_conf = {
         OPT_FLAG("pbo", pbo, 0),
         OPT_STRING_VALIDATE("lscale", scalers[0], 0, validate_scaler_opt),
         OPT_STRING_VALIDATE("cscale", scalers[1], 0, validate_scaler_opt),
-        OPT_STRING_VALIDATE("lscale-down", dscalers[0], 0, validate_scaler_opt),
-        OPT_STRING_VALIDATE("cscale-down", dscalers[1], 0, validate_scaler_opt),
+        OPT_STRING_VALIDATE("lscale-down", dscaler, 0, validate_scaler_opt),
         OPT_FLOAT("lparam1", scaler_params[0][0], 0),
         OPT_FLOAT("lparam2", scaler_params[0][1], 0),
         OPT_FLOAT("cparam1", scaler_params[1][0], 0),
@@ -407,6 +406,7 @@ const struct m_sub_options gl_video_conf = {
         OPT_COLOR("background", background, 0),
 
         OPT_REMOVED("approx-gamma", "this is always enabled now"),
+        OPT_REMOVED("cscale-down", "use 'indirect' and lscale-down"),
         {0}
     },
     .size = sizeof(struct gl_video_opts),
@@ -1435,8 +1435,8 @@ static const char *expected_scaler(struct gl_video *p, int unit)
     {
         return "bilinear";
     }
-    if (p->opts.dscalers[unit] && get_scale_factor(p) < 1.0)
-        return p->opts.dscalers[unit];
+    if (unit == 0 && p->opts.dscaler && get_scale_factor(p) < 1.0)
+        return p->opts.dscaler;
     return p->opts.scalers[unit];
 }
 
@@ -2609,7 +2609,7 @@ void gl_video_set_options(struct gl_video *p, struct gl_video_opts *opts)
     p->opts = *opts;
     for (int n = 0; n < 2; n++) {
         p->opts.scalers[n] = (char *)handle_scaler_opt(p->opts.scalers[n]);
-        p->opts.dscalers[n] = (char *)handle_scaler_opt(p->opts.dscalers[n]);
+        p->opts.dscaler = (char *)handle_scaler_opt(p->opts.dscaler);
     }
 
     if (!p->opts.gamma && p->video_eq.values[MP_CSP_EQ_GAMMA] != 0)
diff --git a/video/out/gl_video.h b/video/out/gl_video.h
index 37c819ecdb..b3c5d5abe5 100644
--- a/video/out/gl_video.h
+++ b/video/out/gl_video.h
@@ -30,7 +30,7 @@ struct lut3d {
 
 struct gl_video_opts {
     char *scalers[2];
-    char *dscalers[2];
+    char *dscaler;
     float scaler_params[2][2];
     float scaler_radius[2];
     int indirect;
-- 
cgit v1.2.3