summaryrefslogtreecommitdiff
path: root/libavfilter/vf_overlay.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2013-05-27 20:41:38 +0200
committerClément Bœsch <ubitux@gmail.com>2013-05-27 20:42:46 +0200
commit92a2d12a710312cf2ceedfa5cadee9747176c322 (patch)
tree871d4115d8e90bf34fb39ed924505996ec313b56 /libavfilter/vf_overlay.c
parentae5738248a9e7d1a43a7ca6d993ec21015b2a7bc (diff)
lavfi/overlay: remove do_blend forward declaration.
Diffstat (limited to 'libavfilter/vf_overlay.c')
-rw-r--r--libavfilter/vf_overlay.c29
1 files changed, 13 insertions, 16 deletions
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index e6d949f2b3..7d93c9e998 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