ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
* origin/master:
  libavfilter/vf_blend: do not unconditionally compile both filters

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-05 15:55:40 +01:00
commit 0e1c827e84
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavfilter/vf_blend.c
View File

@ -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