[FFmpeg-cvslog] lavfi/overlay: remove do_blend forward declaration.

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Mon May 27 20:41:38 2013 +0200| [92a2d12a710312cf2ceedfa5cadee9747176c322] | committer: Clément Bœsch

lavfi/overlay: remove do_blend forward declaration.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92a2d12a710312cf2ceedfa5cadee9747176c322
---

 libavfilter/vf_overlay.c |   29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index e6d949f..7d93c9e 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -107,22 +107,6 @@ typedef struct {
     AVExpr *x_pexpr, *y_pexpr;
 } OverlayContext;
 
-// TODO: remove forward declaration
-static AVFrame *do_blend(AVFilterContext *ctx, AVFrame *mainpic, const AVFrame *second);
-
-static av_cold int init(AVFilterContext *ctx)
-{
-    OverlayContext *s = ctx->priv;
-
-    if (s->allow_packed_rgb) {
-        av_log(ctx, AV_LOG_WARNING,
-               "The rgb option is deprecated and is overriding the format option, use format instead\n");
-        s->format = OVERLAY_FORMAT_RGB;
-    }
-    s->dinput.process = do_blend;
-    return 0;
-}
-
 static av_cold void uninit(AVFilterContext *ctx)
 {
     OverlayContext *s = ctx->priv;
@@ -579,6 +563,19 @@ static int request_frame(AVFilterLink *outlink)
     return ff_dualinput_request_frame(&s->dinput, outlink);
 }
 
+static av_cold int init(AVFilterContext *ctx)
+{
+    OverlayContext *s = ctx->priv;
+
+    if (s->allow_packed_rgb) {
+        av_log(ctx, AV_LOG_WARNING,
+               "The rgb option is deprecated and is overriding the format option, use format instead\n");
+        s->format = OVERLAY_FORMAT_RGB;
+    }
+    s->dinput.process = do_blend;
+    return 0;
+}
+
 #define OFFSET(x) offsetof(OverlayContext, x)
 #define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM