[FFmpeg-devel] [PATCH 2/5] avfilter/phase: do not pass the whole context to analyze_plane().
Clément Bœsch
u at pkh.me
Sat May 3 22:48:27 CEST 2014
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 281f736..11337e4 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++) {
--
1.9.2
More information about the ffmpeg-devel
mailing list