RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-16 20:17:45 +00:00
Code Issues Projects Releases Wiki Activity

vf_lut: correct color/comp permutation

Browse Source 
Fixes Ticket2225

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-27 17:08:50 +01:00
parent c87c2d0d02
commit 21c2e201f6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/vf_lut.c
View File

@ -178,7 +178,7 @@ static int config_props(AVFilterLink *inlink)
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
uint8_t rgba_map[4]; /* component index -> RGBA color index map */ uint8_t rgba_map[4]; /* component index -> RGBA color index map */
int min[4], max[4]; int min[4], max[4];
int val, comp, ret; int val, color, ret;
lut->hsub = desc->log2_chroma_w; lut->hsub = desc->log2_chroma_w;
lut->vsub = desc->log2_chroma_h; lut->vsub = desc->log2_chroma_h;
@ -213,9 +213,9 @@ static int config_props(AVFilterLink *inlink)
lut->step = av_get_bits_per_pixel(desc) >> 3; lut->step = av_get_bits_per_pixel(desc) >> 3;
} }
for (comp = 0; comp < desc->nb_components; comp++) { for (color = 0; color < desc->nb_components; color++) {
double res; double res;
int color = lut->is_rgb ? rgba_map[comp] : comp; int comp = lut->is_rgb ? rgba_map[color] : color;
/* create the parsed expression */ /* create the parsed expression */
ret = av_expr_parse(&lut->comp_expr[color], lut->comp_expr_str[color], ret = av_expr_parse(&lut->comp_expr[color], lut->comp_expr_str[color],