diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-08-21 19:12:09 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 22:18:46 +0200 |
| commit | 6e51e746c42607e35e8595bd66a8f50e1d9c40a4 (patch) | |
| tree | 3829b47d6eafee6f0f1d76ec5dddbe0add9eb024 /libavfilter/vf_vidstabtransform.c | |
| parent | d2a06242966d7a640d32d304a5653f4e1545f259 (diff) | |
vidstab*: Remove accidentally exported av_2_vs_pixel_format()
Also correctly namespace other functions in vidstabutils, and decrease
difference from Libav.
Initial-patch-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_vidstabtransform.c')
| -rw-r--r-- | libavfilter/vf_vidstabtransform.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/vf_vidstabtransform.c b/libavfilter/vf_vidstabtransform.c index 3ce4769483..1bd43ff7c9 100644 --- a/libavfilter/vf_vidstabtransform.c +++ b/libavfilter/vf_vidstabtransform.c @@ -107,7 +107,7 @@ AVFILTER_DEFINE_CLASS(vidstabtransform); static av_cold int init(AVFilterContext *ctx) { TransformContext *tc = ctx->priv; - vs_set_mem_and_log_functions(); + ff_vs_init(); tc->class = &vidstabtransform_class; av_log(ctx, AV_LOG_VERBOSE, "vidstabtransform filter: init %s\n", LIBVIDSTAB_VERSION); return 0; @@ -151,9 +151,9 @@ static int config_input(AVFilterLink *inlink) VSFrameInfo fi_dest; if (!vsFrameInfoInit(&fi_src, inlink->w, inlink->h, - av_2_vs_pixel_format(ctx, inlink->format)) || + ff_av2vs_pixfmt(ctx, inlink->format)) || !vsFrameInfoInit(&fi_dest, inlink->w, inlink->h, - av_2_vs_pixel_format(ctx, inlink->format))) { + ff_av2vs_pixfmt(ctx, inlink->format))) { av_log(ctx, AV_LOG_ERROR, "unknown pixel format: %i (%s)", inlink->format, desc->name); return AVERROR(EINVAL); |