starred/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-01-23 23:21:06 +01:00
Code Issues 5 Projects Packages Wiki Activity Actions

Merge commit 'faa8245bd4'

Browse source 
* commit 'faa8245bd4':
  vf_lut: Constantize

Conflicts:
	libavfilter/vf_lut.c

See: d7e95ccd9f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-01 13:07:40 +02:00
commit 67d7ea9825
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libavfilter/vf_lut.c
View file

@ -128,7 +128,8 @@ static int query_formats(AVFilterContext *ctx)
LutContext *s = ctx->priv;
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));
return 0;