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_libvmaf.c | |
parent | 1b8e061cc574d7d5ce7def14c5648eaef07d9187 (diff) | |
download | ffmpeg-5f5dcf44e3c40da8c2334b9d2e62f30739d644c0.tar.gz |
lavfi: rename framesync2 to framesync.
Diffstat (limited to 'libavfilter/vf_libvmaf.c')
-rw-r--r-- | libavfilter/vf_libvmaf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index 405820f182..2c3a9f3349 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -32,7 +32,7 @@ #include "avfilter.h" #include "drawutils.h" #include "formats.h" -#include "framesync2.h" +#include "framesync.h" #include "internal.h" #include "video.h" @@ -177,7 +177,7 @@ static int do_vmaf(FFFrameSync *fs) AVFrame *main, *ref; int ret; - ret = ff_framesync2_dualinput_get(fs, &main, &ref); + ret = ff_framesync_dualinput_get(fs, &main, &ref); if (ret < 0) return ret; if (!ref) @@ -266,7 +266,7 @@ static int config_output(AVFilterLink *outlink) AVFilterLink *mainlink = ctx->inputs[0]; int ret; - ret = ff_framesync2_init_dualinput(&s->fs, ctx); + ret = ff_framesync_init_dualinput(&s->fs, ctx); if (ret < 0) return ret; outlink->w = mainlink->w; @@ -274,7 +274,7 @@ static int config_output(AVFilterLink *outlink) outlink->time_base = mainlink->time_base; outlink->sample_aspect_ratio = mainlink->sample_aspect_ratio; outlink->frame_rate = mainlink->frame_rate; - if ((ret = ff_framesync2_configure(&s->fs)) < 0) + if ((ret = ff_framesync_configure(&s->fs)) < 0) return ret; return 0; @@ -283,14 +283,14 @@ static int config_output(AVFilterLink *outlink) static int activate(AVFilterContext *ctx) { LIBVMAFContext *s = ctx->priv; - return ff_framesync2_activate(&s->fs); + return ff_framesync_activate(&s->fs); } static av_cold void uninit(AVFilterContext *ctx) { LIBVMAFContext *s = ctx->priv; - ff_framesync2_uninit(&s->fs); + ff_framesync_uninit(&s->fs); pthread_mutex_lock(&s->lock); s->eof = 1; |