diff options
author | Nicolas George <george@nsup.org> | 2017-08-31 19:47:37 +0200 |
---|---|---|
committer | Nicolas George <george@nsup.org> | 2017-09-12 11:03:51 +0200 |
commit | 5f5dcf44e3c40da8c2334b9d2e62f30739d644c0 (patch) | |
tree | 54f67261180b1b02ed30e2e0995525d4ba725acc /libavfilter/vf_premultiply.c | |
parent | 1b8e061cc574d7d5ce7def14c5648eaef07d9187 (diff) |
lavfi: rename framesync2 to framesync.
Diffstat (limited to 'libavfilter/vf_premultiply.c')
-rw-r--r-- | libavfilter/vf_premultiply.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavfilter/vf_premultiply.c b/libavfilter/vf_premultiply.c index 148a9e55cb..5120adc476 100644 --- a/libavfilter/vf_premultiply.c +++ b/libavfilter/vf_premultiply.c @@ -24,7 +24,7 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "framesync2.h" +#include "framesync.h" #include "internal.h" #include "video.h" @@ -503,8 +503,8 @@ static int process_frame(FFFrameSync *fs) AVFrame *out = NULL, *base, *alpha; int ret; - if ((ret = ff_framesync2_get_frame(&s->fs, 0, &base, 0)) < 0 || - (ret = ff_framesync2_get_frame(&s->fs, 1, &alpha, 0)) < 0) + if ((ret = ff_framesync_get_frame(&s->fs, 0, &base, 0)) < 0 || + (ret = ff_framesync_get_frame(&s->fs, 1, &alpha, 0)) < 0) return ret; if ((ret = filter_frame(ctx, &out, base, alpha)) < 0) @@ -578,7 +578,7 @@ static int config_output(AVFilterLink *outlink) if (s->inplace) return 0; - if ((ret = ff_framesync2_init(&s->fs, ctx, 2)) < 0) + if ((ret = ff_framesync_init(&s->fs, ctx, 2)) < 0) return ret; in = s->fs.in; @@ -593,7 +593,7 @@ static int config_output(AVFilterLink *outlink) s->fs.opaque = s; s->fs.on_event = process_frame; - return ff_framesync2_configure(&s->fs); + return ff_framesync_configure(&s->fs); } static int activate(AVFilterContext *ctx) @@ -623,7 +623,7 @@ static int activate(AVFilterContext *ctx) return 0; } } else { - return ff_framesync2_activate(&s->fs); + return ff_framesync_activate(&s->fs); } } @@ -668,7 +668,7 @@ static av_cold void uninit(AVFilterContext *ctx) PreMultiplyContext *s = ctx->priv; if (!s->inplace) - ff_framesync2_uninit(&s->fs); + ff_framesync_uninit(&s->fs); } static const AVFilterPad premultiply_outputs[] = { |