mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce'
* commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce':
vf_lut: Constantize
Conflicts:
libavfilter/vf_lut.c
See: d7e95ccd9f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
67d7ea9825
|
@ -128,7 +128,8 @@ static int query_formats(AVFilterContext *ctx)
|
||||||
LutContext *s = ctx->priv;
|
LutContext *s = ctx->priv;
|
||||||
|
|
||||||
const enum AVPixelFormat *pix_fmts = s->is_rgb ? rgb_pix_fmts :
|
const enum AVPixelFormat *pix_fmts = s->is_rgb ? rgb_pix_fmts :
|
||||||
s->is_yuv ? yuv_pix_fmts : all_pix_fmts;
|
s->is_yuv ? yuv_pix_fmts :
|
||||||
|
all_pix_fmts;
|
||||||
|
|
||||||
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
|
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue