virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

lavfi/overlay: remove do_blend forward declaration.

Browse Source
This commit is contained in:
Clément Bœsch 2013-05-27 20:41:38 +02:00
parent ae5738248a
commit 92a2d12a71
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavfilter/vf_overlay.c
View File

@ -107,22 +107,6 @@ typedef struct {
AVExpr *x_pexpr, *y_pexpr; AVExpr *x_pexpr, *y_pexpr;
} OverlayContext; } 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) static av_cold void uninit(AVFilterContext *ctx)
{ {
OverlayContext *s = ctx->priv; OverlayContext *s = ctx->priv;
@ -579,6 +563,19 @@ static int request_frame(AVFilterLink *outlink)
return ff_dualinput_request_frame(&s->dinput, 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 OFFSET(x) offsetof(OverlayContext, x)
#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM #define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM