From 4719e563a4237adb5bf83119bba46b61c2e40ceb Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sun, 27 Nov 2016 11:43:54 +0100 Subject: [PATCH] avfilter/vf_zscale: export approximate gamma option and enable it by default Signed-off-by: Paul B Mahol --- libavfilter/vf_zscale.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 122ca3339d..1675278935 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -97,6 +97,7 @@ typedef struct ZScaleContext { int chromal_in; char *size_str; double nominal_peak_luminance; + int approximate_gamma; char *w_expr; ///< width expression string char *h_expr; ///< height expression string @@ -480,6 +481,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) s->params.resample_filter = s->filter; s->params.resample_filter_uv = s->filter; s->params.nominal_peak_luminance = s->nominal_peak_luminance; + s->params.allow_approximate_gamma = s->approximate_gamma; s->src_format.width = in->width; s->src_format.height = in->height; @@ -762,6 +764,7 @@ static const AVOption zscale_options[] = { { "chromalin", "set input chroma location", OFFSET(chromal_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_CHROMA_BOTTOM, FLAGS, "chroma" }, { "cin", "set input chroma location", OFFSET(chromal_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_CHROMA_BOTTOM, FLAGS, "chroma" }, { "npl", "set nominal peak luminance", OFFSET(nominal_peak_luminance), AV_OPT_TYPE_DOUBLE, {.dbl = NAN}, 0, DBL_MAX, FLAGS }, + { "agamma", "allow approximate gamma", OFFSET(approximate_gamma), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, FLAGS }, { NULL } };