diff options
| author | wm4 <wm4@nowhere> | 2015-09-29 21:12:26 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-09-29 21:12:26 +0200 |
| commit | ee63c9c210683df9cbf17f7bbc5f4de8725260f3 (patch) | |
| tree | 4079022e388fb4ff4bf0dfefe03f0f4d3cffbe0c /video/mp_image.c | |
| parent | b4491c00c4b514e925b6bbf501e26de801f28a39 (diff) | |
| download | mpv-ee63c9c210683df9cbf17f7bbc5f4de8725260f3.tar.bz2 mpv-ee63c9c210683df9cbf17f7bbc5f4de8725260f3.tar.xz | |
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.
Diffstat (limited to 'video/mp_image.c')
| -rw-r--r-- | video/mp_image.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/video/mp_image.c b/video/mp_image.c index 57650eea0d..a3472baf3f 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -394,7 +394,6 @@ void mp_image_copy_attributes(struct mp_image *dst, struct mp_image *src) dst->params.colorspace = src->params.colorspace; dst->params.colorlevels = src->params.colorlevels; dst->params.chroma_location = src->params.chroma_location; - dst->params.outputlevels = src->params.outputlevels; } mp_image_params_guess_csp(&dst->params); // ensure colorspace consistency if ((dst->fmt.flags & MP_IMGFLAG_PAL) && (src->fmt.flags & MP_IMGFLAG_PAL)) { @@ -491,10 +490,6 @@ char *mp_image_params_to_str_buf(char *b, size_t bs, m_opt_choice_str(mp_csp_levels_names, p->colorlevels)); mp_snprintf_cat(b, bs, " CL=%s", m_opt_choice_str(mp_chroma_names, p->chroma_location)); - if (p->outputlevels) { - mp_snprintf_cat(b, bs, " out=%s", - m_opt_choice_str(mp_csp_levels_names, p->outputlevels)); - } if (p->rotate) mp_snprintf_cat(b, bs, " rot=%d", p->rotate); if (p->stereo_in > 0 || p->stereo_out > 0) { @@ -541,7 +536,6 @@ bool mp_image_params_equal(const struct mp_image_params *p1, p1->d_w == p2->d_w && p1->d_h == p2->d_h && p1->colorspace == p2->colorspace && p1->colorlevels == p2->colorlevels && - p1->outputlevels == p2->outputlevels && p1->primaries == p2->primaries && p1->gamma == p2->gamma && p1->chroma_location == p2->chroma_location && |