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_vidstabdetect.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_vidstabdetect.c')
| -rw-r--r-- | libavfilter/vf_vidstabdetect.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavfilter/vf_vidstabdetect.c b/libavfilter/vf_vidstabdetect.c index 9b4b20f47f..bf067afaf9 100644 --- a/libavfilter/vf_vidstabdetect.c +++ b/libavfilter/vf_vidstabdetect.c @@ -63,7 +63,7 @@ AVFILTER_DEFINE_CLASS(vidstabdetect); static av_cold int init(AVFilterContext *ctx) { StabData *sd = ctx->priv; - vs_set_mem_and_log_functions(); + ff_vs_init(); sd->class = &vidstabdetect_class; av_log(ctx, AV_LOG_VERBOSE, "vidstabdetect filter: init %s\n", LIBVIDSTAB_VERSION); return 0; @@ -106,7 +106,8 @@ static int config_input(AVFilterLink *inlink) VSFrameInfo fi; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); - vsFrameInfoInit(&fi, inlink->w, inlink->h, av_2_vs_pixel_format(ctx, inlink->format)); + vsFrameInfoInit(&fi, inlink->w, inlink->h, + ff_av2vs_pixfmt(ctx, inlink->format)); if (fi.bytesPerPixel != av_get_bits_per_pixel(desc)/8) { av_log(ctx, AV_LOG_ERROR, "pixel-format error: wrong bits/per/pixel, please report a BUG"); return AVERROR(EINVAL); |