From ee63c9c210683df9cbf17f7bbc5f4de8725260f3 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 29 Sep 2015 21:12:26 +0200
Subject: video: replace vf_format outputlevels option with global option

The vf_format suboption is replaced with --video-output-levels (a global
option and property). In particular, the parameter is removed from
mp_image_params. The mechanism is moved to the "video equalizer", which
also handles common video output customization like brightness and
contrast controls.

The new code is slightly cleaner, and the top-level option is slightly
more user-friendly than as vf_format sub-option.
---
 video/filter/vf_format.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'video/filter')

diff --git a/video/filter/vf_format.c b/video/filter/vf_format.c
index 881f1026d2..83d697b412 100644
--- a/video/filter/vf_format.c
+++ b/video/filter/vf_format.c
@@ -34,7 +34,6 @@ struct vf_priv_s {
     int outfmt;
     int colormatrix;
     int colorlevels;
-    int outputlevels;
     int primaries;
     int gamma;
     int chroma_location;
@@ -89,8 +88,6 @@ static int reconfig(struct vf_instance *vf, struct mp_image_params *in,
         out->colorspace = p->colormatrix;
     if (p->colorlevels)
         out->colorlevels = p->colorlevels;
-    if (p->outputlevels)
-        out->outputlevels = p->outputlevels;
     if (p->primaries)
         out->primaries = p->primaries;
     if (p->gamma)
@@ -137,7 +134,6 @@ static const m_option_t vf_opts_fields[] = {
     OPT_IMAGEFORMAT("outfmt", outfmt, 0),
     OPT_CHOICE_C("colormatrix", colormatrix, 0, mp_csp_names),
     OPT_CHOICE_C("colorlevels", colorlevels, 0, mp_csp_levels_names),
-    OPT_CHOICE_C("outputlevels", outputlevels, 0, mp_csp_levels_names),
     OPT_CHOICE_C("primaries", primaries, 0, mp_csp_prim_names),
     OPT_CHOICE_C("gamma", gamma, 0, mp_csp_trc_names),
     OPT_CHOICE_C("chroma-location", chroma_location, 0, mp_chroma_names),
@@ -147,6 +143,7 @@ static const m_option_t vf_opts_fields[] = {
     OPT_INT("dw", dw, 0),
     OPT_INT("dh", dh, 0),
     OPT_DOUBLE("dar", dar, 0),
+    OPT_REMOVED("outputlevels", "use the --video-output-levels global option"),
     {0}
 };
 
-- 
cgit v1.2.3