ffmpeg | branch: master | Paul B Mahol <[email protected]> | Sun Jan 4 12:27:56 2015 +0000| [91bdb244009c7d33d547bf7901ef1ae4538a51df] | committer: Paul B Mahol
libavfilter/vf_blend: do not unconditionally compile both filters Signed-off-by: Paul B Mahol <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91bdb244009c7d33d547bf7901ef1ae4538a51df --- libavfilter/vf_blend.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 538774b..a29cabc 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -373,6 +373,20 @@ static int query_formats(AVFilterContext *ctx) return 0; } +static av_cold void uninit(AVFilterContext *ctx) +{ + BlendContext *b = ctx->priv; + int i; + + ff_dualinput_uninit(&b->dinput); + av_freep(&b->prev_frame); + + for (i = 0; i < FF_ARRAY_ELEMS(b->params); i++) + av_expr_free(b->params[i].e); +} + +#if CONFIG_BLEND_FILTER + static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; @@ -418,18 +432,6 @@ static int config_output(AVFilterLink *outlink) return 0; } -static av_cold void uninit(AVFilterContext *ctx) -{ - BlendContext *b = ctx->priv; - int i; - - ff_dualinput_uninit(&b->dinput); - av_freep(&b->prev_frame); - - for (i = 0; i < FF_ARRAY_ELEMS(b->params); i++) - av_expr_free(b->params[i].e); -} - static int request_frame(AVFilterLink *outlink) { BlendContext *b = outlink->src->priv; @@ -478,6 +480,10 @@ AVFilter ff_vf_blend = { .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; +#endif + +#if CONFIG_TBLEND_FILTER + static int tblend_config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; @@ -545,3 +551,5 @@ AVFilter ff_vf_tblend = { .outputs = tblend_outputs, .flags = AVFILTER_FLAG_SLICE_THREADS, }; + +#endif _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
