virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avfilter/palettegen: use a logging context for the dupped color warning

Browse Source
This commit is contained in:
Clément Bœsch
2015-02-26 10:19:45 +01:00
parent ab093bdeef
commit 4216968f85
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/vf_palettegen.c
View File

@@ -225,8 +225,9 @@ static void split_box(PaletteGenContext *s, struct range_box *box, int n)
/** /**
* Write the palette into the output frame. * Write the palette into the output frame.
*/ */
static void write_palette(const PaletteGenContext *s, AVFrame *out) static void write_palette(AVFilterContext *ctx, AVFrame *out)
{ {
const PaletteGenContext *s = ctx->priv;
int x, y, box_id = 0; int x, y, box_id = 0;
uint32_t *pal = (uint32_t *)out->data[0]; uint32_t *pal = (uint32_t *)out->data[0];
const int pal_linesize = out->linesize[0] >> 2; const int pal_linesize = out->linesize[0] >> 2;
@@ -237,7 +238,7 @@ static void write_palette(const PaletteGenContext *s, AVFrame *out)
if (box_id < s->nb_boxes) { if (box_id < s->nb_boxes) {
pal[x] = s->boxes[box_id++].color; pal[x] = s->boxes[box_id++].color;
if ((x || y) && pal[x] == last_color) if ((x || y) && pal[x] == last_color)
av_log(NULL, AV_LOG_WARNING, "Dupped color: %08X\n", pal[x]); av_log(ctx, AV_LOG_WARNING, "Dupped color: %08X\n", pal[x]);
last_color = pal[x]; last_color = pal[x];
} else { } else {
pal[x] = 0xff000000; // pad with black pal[x] = 0xff000000; // pad with black
@@ -378,7 +379,7 @@ static AVFrame *get_palette_frame(AVFilterContext *ctx)
qsort(s->boxes, s->nb_boxes, sizeof(*s->boxes), cmp_color); qsort(s->boxes, s->nb_boxes, sizeof(*s->boxes), cmp_color);
write_palette(s, out); write_palette(ctx, out);
return out; return out;
} }