Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2015-02-26 12:19:45 +0300
committerClément Bœsch <clement@stupeflix.com>2015-02-26 16:20:02 +0300
commit4216968f854bc8cec0d9b95943186d2e5c74a7f2 (patch)
tree138e736a4b14e98201773a19fced7dde041fcd40 /libavfilter/vf_palettegen.c
parentab093bdeefad1489264e064b43e937f40b83f531 (diff)
avfilter/palettegen: use a logging context for the dupped color warning
Diffstat (limited to 'libavfilter/vf_palettegen.c')
-rw-r--r--libavfilter/vf_palettegen.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavfilter/vf_palettegen.c b/libavfilter/vf_palettegen.c
index 0d52843cb8..878b2f7924 100644
--- a/libavfilter/vf_palettegen.c
+++ b/libavfilter/vf_palettegen.c
@@ -225,8 +225,9 @@ static void split_box(PaletteGenContext *s, struct range_box *box, int n)
/**
* 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;
uint32_t *pal = (uint32_t *)out->data[0];
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) {
pal[x] = s->boxes[box_id++].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];
} else {
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);
- write_palette(s, out);
+ write_palette(ctx, out);
return out;
}