videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avfilter/palettegen: use box->major_axis without intermediate variable

This commit is contained in:
Clément Bœsch 2022-12-27 18:27:14 +01:00
parent 86bced7c65
commit 9e5f494d26
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/vf_palettegen.c
View File

@ -363,22 +363,21 @@ static AVFrame *get_palette_frame(AVFilterContext *ctx)
s->nb_boxes = 1;
while (box && box->len > 1) {
int i, longest;
int i;
uint64_t median, box_weight;
compute_box_stats(s, box);
longest = box->major_axis;
box_weight = box->weight;
ff_dlog(ctx, "box #%02X [%6d..%-6d] (%6d) w:%-6"PRIu64" sort by %c (already sorted:%c) ",
box_id, box->start, box->start + box->len - 1, box->len, box_weight,
"rgb"[longest], box->sorted_by == longest ? 'y':'n');
"rgb"[box->major_axis], box->sorted_by == box->major_axis ? 'y':'n');
/* sort the range by its longest axis if it's not already sorted */
if (box->sorted_by != longest) {
cmp_func cmpf = cmp_funcs[longest];
/* sort the range by its major axis if it's not already sorted */
if (box->sorted_by != box->major_axis) {
cmp_func cmpf = cmp_funcs[box->major_axis];
AV_QSORT(&s->refs[box->start], box->len, const struct color_ref *, cmpf);
box->sorted_by = longest;
box->sorted_by = box->major_axis;
}
/* locate the median where to split */