X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_ciescope.c;h=719e66ad0f087e182530120df43e4e7a641e8698;hb=18befac5da2c71aeb9922b6fd5551502f4c5a913;hp=5a7c3d7b5d87cdd76968fb1eb41d31368757e97d;hpb=3883c9d1479d3e653bb66c9960fdd2ebd6ba9594;p=ffmpeg diff --git a/libavfilter/vf_ciescope.c b/libavfilter/vf_ciescope.c index 5a7c3d7b5d8..719e66ad0f0 100644 --- a/libavfilter/vf_ciescope.c +++ b/libavfilter/vf_ciescope.c @@ -139,10 +139,10 @@ static int query_formats(AVFilterContext *ctx) { int ret; - if ((ret = ff_formats_ref(ff_make_format_list(in_pix_fmts), &ctx->inputs[0]->out_formats)) < 0) + if ((ret = ff_formats_ref(ff_make_format_list(in_pix_fmts), &ctx->inputs[0]->outcfg.formats)) < 0) return ret; - if ((ret = ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->in_formats)) < 0) + if ((ret = ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->incfg.formats)) < 0) return ret; return 0; @@ -1190,15 +1190,11 @@ plot_white_point(uint16_t* pixels, if (cie == LUV) { double wup, wvp; xy_to_upvp(cs->xWhite, cs->yWhite, &wup, &wvp); - wx = wup; - wy = wvp; wx = (w - 1) * wup; wy = (h - 1) - ((int) ((h - 1) * wvp)); } else if (cie == UCS) { double wu, wv; xy_to_uv(cs->xWhite, cs->yWhite, &wu, &wv); - wx = wu; - wy = wv; wx = (w - 1) * wu; wy = (h - 1) - ((int) ((h - 1) * wv)); } else if (cie == XYY) {