diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-01 13:07:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-01 13:10:07 +0200 |
| commit | 67d7ea9825f6c3dfae5323c5252dbc602acddd1d (patch) | |
| tree | 94a813d13462199cf98a902f8fdafcdd74f73647 | |
| parent | 7c1805869d6f8dd9292977393aa4d97417716852 (diff) | |
| parent | faa8245bd45c1a6dd220ba9407ea1c82132aa1ce (diff) | |
| download | ffmpeg-67d7ea9825f6c3dfae5323c5252dbc602acddd1d.tar.gz | |
Merge commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce'
* commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce':
vf_lut: Constantize
Conflicts:
libavfilter/vf_lut.c
See: d7e95ccd9ff3e55e194582a105421fa308a83ef1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/vf_lut.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index d2fd4a14bf..4b4c8bc61b 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -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; |