Browse code

lavfi/overlay: remove do_blend forward declaration.

Clément Bœsch authored on 2013/05/28 03:41:38
Showing 1 changed files
... ...
@@ -107,22 +107,6 @@ typedef struct {
107 107
     AVExpr *x_pexpr, *y_pexpr;
108 108
 } OverlayContext;
109 109
 
110
-// TODO: remove forward declaration
111
-static AVFrame *do_blend(AVFilterContext *ctx, AVFrame *mainpic, const AVFrame *second);
112
-
113
-static av_cold int init(AVFilterContext *ctx)
114
-{
115
-    OverlayContext *s = ctx->priv;
116
-
117
-    if (s->allow_packed_rgb) {
118
-        av_log(ctx, AV_LOG_WARNING,
119
-               "The rgb option is deprecated and is overriding the format option, use format instead\n");
120
-        s->format = OVERLAY_FORMAT_RGB;
121
-    }
122
-    s->dinput.process = do_blend;
123
-    return 0;
124
-}
125
-
126 110
 static av_cold void uninit(AVFilterContext *ctx)
127 111
 {
128 112
     OverlayContext *s = ctx->priv;
... ...
@@ -579,6 +563,19 @@ static int request_frame(AVFilterLink *outlink)
579 579
     return ff_dualinput_request_frame(&s->dinput, outlink);
580 580
 }
581 581
 
582
+static av_cold int init(AVFilterContext *ctx)
583
+{
584
+    OverlayContext *s = ctx->priv;
585
+
586
+    if (s->allow_packed_rgb) {
587
+        av_log(ctx, AV_LOG_WARNING,
588
+               "The rgb option is deprecated and is overriding the format option, use format instead\n");
589
+        s->format = OVERLAY_FORMAT_RGB;
590
+    }
591
+    s->dinput.process = do_blend;
592
+    return 0;
593
+}
594
+
582 595
 #define OFFSET(x) offsetof(OverlayContext, x)
583 596
 #define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
584 597