diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-05 15:55:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-05 15:55:47 +0100 |
| commit | 0e1c827e842c0a86eb32de853162d97e214e2b23 (patch) | |
| tree | ee95c80b2ba25b45a0ed8184bcb9620a2ce5e721 /libavfilter | |
| parent | c9151de7c42553bb145be608df8513c1287f1f24 (diff) | |
| parent | 91bdb244009c7d33d547bf7901ef1ae4538a51df (diff) | |
| download | ffmpeg-0e1c827e842c0a86eb32de853162d97e214e2b23.tar.gz | |
Merge remote-tracking branch 'origin/master'
* origin/master:
libavfilter/vf_blend: do not unconditionally compile both filters
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_blend.c | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 538774be3f..a29cabcdc8 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 |