diff options
| author | Nicolas George <george@nsup.org> | 2017-08-31 20:47:37 +0300 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2017-09-12 12:03:51 +0300 |
| commit | 5f5dcf44e3c40da8c2334b9d2e62f30739d644c0 (patch) | |
| tree | 54f67261180b1b02ed30e2e0995525d4ba725acc /libavfilter/vf_blend.c | |
| parent | 1b8e061cc574d7d5ce7def14c5648eaef07d9187 (diff) | |
lavfi: rename framesync2 to framesync.
Diffstat (limited to 'libavfilter/vf_blend.c')
| -rw-r--r-- | libavfilter/vf_blend.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 4939b10150..054c0d55d0 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -25,7 +25,7 @@ #include "avfilter.h" #include "bufferqueue.h" #include "formats.h" -#include "framesync2.h" +#include "framesync.h" #include "internal.h" #include "video.h" #include "blend.h" @@ -411,7 +411,7 @@ static int blend_frame_for_dualinput(FFFrameSync *fs) AVFrame *top_buf, *bottom_buf, *dst_buf; int ret; - ret = ff_framesync2_dualinput_get(fs, &top_buf, &bottom_buf); + ret = ff_framesync_dualinput_get(fs, &top_buf, &bottom_buf); if (ret < 0) return ret; if (!bottom_buf) @@ -454,7 +454,7 @@ static av_cold void uninit(AVFilterContext *ctx) BlendContext *s = ctx->priv; int i; - ff_framesync2_uninit(&s->fs); + ff_framesync_uninit(&s->fs); av_frame_free(&s->prev_frame); for (i = 0; i < FF_ARRAY_ELEMS(s->params); i++) @@ -554,7 +554,7 @@ static int config_output(AVFilterLink *outlink) s->nb_planes = av_pix_fmt_count_planes(toplink->format); if (!s->tblend) - if ((ret = ff_framesync2_init_dualinput(&s->fs, ctx)) < 0) + if ((ret = ff_framesync_init_dualinput(&s->fs, ctx)) < 0) return ret; for (plane = 0; plane < FF_ARRAY_ELEMS(s->params); plane++) { @@ -581,7 +581,7 @@ static int config_output(AVFilterLink *outlink) } } - return s->tblend ? 0 : ff_framesync2_configure(&s->fs); + return s->tblend ? 0 : ff_framesync_configure(&s->fs); } #if CONFIG_BLEND_FILTER @@ -589,7 +589,7 @@ static int config_output(AVFilterLink *outlink) static int activate(AVFilterContext *ctx) { BlendContext *s = ctx->priv; - return ff_framesync2_activate(&s->fs); + return ff_framesync_activate(&s->fs); } static const AVFilterPad blend_inputs[] = { |