From 687119aa9d2d93ee069ae4a320f8d63ee791e6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Sat, 3 May 2014 22:41:33 +0200 Subject: [PATCH] avfilter/phase: do not pass the whole context to analyze_plane(). Also make sure the AVFilterContext is only being used for logging by changing the type to void* --- libavfilter/vf_phase.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_phase.c b/libavfilter/vf_phase.c index 281f73636b..11337e47d2 100644 --- a/libavfilter/vf_phase.c +++ b/libavfilter/vf_phase.c @@ -112,8 +112,7 @@ static int config_input(AVFilterLink *inlink) * Find which field combination has the smallest average squared difference * between the fields. */ -static enum PhaseMode analyze_plane(AVFilterContext *ctx, PhaseContext *s, - AVFrame *old, AVFrame *new) +static enum PhaseMode analyze_plane(void *ctx, enum PhaseMode mode, AVFrame *old, AVFrame *new) { double bdiff, tdiff, pdiff, scale; const int ns = new->linesize[0]; @@ -123,7 +122,6 @@ static enum PhaseMode analyze_plane(AVFilterContext *ctx, PhaseContext *s, const int h = new->height; const int w = new->width; int bdif, tdif, pdif; - enum PhaseMode mode = s->mode; uint8_t *end, *rend; int top, t; @@ -261,7 +259,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) return AVERROR(ENOMEM); } } else { - mode = analyze_plane(ctx, s, s->frame, in); + mode = analyze_plane(ctx, s->mode, s->frame, in); } for (plane = 0; plane < s->nb_planes; plane++) {