Merge commit '0ce3761c781f2c2de40a5a8a99563878804f47cc'

[ffmpeg] / libavfilter / vf_midequalizer.c

diff --git a/libavfilter/vf_midequalizer.c b/libavfilter/vf_midequalizer.c
index 99d26c751ed9daf9e0d7d6b3a7c2d6e50320b22e..c03814a24fadcf07018c8f09f62f230714bacbde 100644 (file)
--- a/libavfilter/vf_midequalizer.c
+++ b/libavfilter/vf_midequalizer.c
@@ -66,7 +66,7 @@ static int query_formats(AVFilterContext *ctx)
         AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ420P,
         AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P,
         AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP,
-        AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12,
+        AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12,
         AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9,
         AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10,
         AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12,
@@ -329,16 +329,10 @@ static int config_output(AVFilterLink *outlink)
     return ff_framesync_configure(&s->fs);
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
+static int activate(AVFilterContext *ctx)
 {
-    MidEqualizerContext *s = inlink->dst->priv;
-    return ff_framesync_filter_frame(&s->fs, inlink, buf);
-}
-
-static int request_frame(AVFilterLink *outlink)
-{
-    MidEqualizerContext *s = outlink->src->priv;
-    return ff_framesync_request_frame(&s->fs, outlink);
+    MidEqualizerContext *s = ctx->priv;
+    return ff_framesync_activate(&s->fs);
 }
 
 static av_cold void uninit(AVFilterContext *ctx)
@@ -355,13 +349,11 @@ static const AVFilterPad midequalizer_inputs[] = {
     {
         .name         = "in0",
         .type         = AVMEDIA_TYPE_VIDEO,
-        .filter_frame = filter_frame,
         .config_props = config_input0,
     },
     {
         .name         = "in1",
         .type         = AVMEDIA_TYPE_VIDEO,
-        .filter_frame = filter_frame,
         .config_props = config_input1,
     },
     { NULL }
@@ -372,7 +364,6 @@ static const AVFilterPad midequalizer_outputs[] = {
         .name          = "default",
         .type          = AVMEDIA_TYPE_VIDEO,
         .config_props  = config_output,
-        .request_frame = request_frame,
     },
     { NULL }
 };
@@ -383,6 +374,7 @@ AVFilter ff_vf_midequalizer = {
     .priv_size     = sizeof(MidEqualizerContext),
     .uninit        = uninit,
     .query_formats = query_formats,
+    .activate      = activate,
     .inputs        = midequalizer_inputs,
     .outputs       = midequalizer_outputs,
     .priv_class    = &midequalizer_class,