@@ -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);

@@ -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);

@@ -21,7 +21,7 @@

 #include "vidstabutils.h"

 /** convert AV's pixelformat to vid.stab pixelformat */

-VSPixelFormat av_2_vs_pixel_format(AVFilterContext *ctx, enum AVPixelFormat pf)

+VSPixelFormat ff_av2vs_pixfmt(AVFilterContext *ctx, enum AVPixelFormat pf)

 {

     switch (pf) {

     case AV_PIX_FMT_YUV420P:  return PF_YUV420P;

@@ -47,7 +47,7 @@ typedef struct {

 } VS2AVLogCtx;

 /** wrapper to log vs_log into av_log */

-static int vs_2_av_log_wrapper(int type, const char *tag, const char *format, ...)

+static int vs2av_log(int type, const char *tag, const char *format, ...)

 {

     va_list ap;

     VS2AVLogCtx ctx;

@@ -66,7 +66,7 @@ static int vs_2_av_log_wrapper(int type, const char *tag, const char *format, ..

 }

 /** sets the memory allocation function and logging constants to av versions */

-void vs_set_mem_and_log_functions(void)

+void ff_vs_init(void)

 {

     vs_malloc  = av_malloc;

     vs_zalloc  = av_mallocz;

@@ -78,7 +78,7 @@ void vs_set_mem_and_log_functions(void)

     VS_INFO_TYPE  = AV_LOG_INFO;

     VS_MSG_TYPE   = AV_LOG_VERBOSE;

-    vs_log   = vs_2_av_log_wrapper;

+    vs_log   = vs2av_log;

     VS_ERROR = 0;

     VS_OK    = 1;

@@ -28,9 +28,9 @@

 /* ** some conversions from avlib to vid.stab constants and functions *** */

 /** converts the pixelformat of avlib into the one of the vid.stab library */

-VSPixelFormat av_2_vs_pixel_format(AVFilterContext *ctx, enum AVPixelFormat pf);

+VSPixelFormat ff_av2vs_pixfmt(AVFilterContext *ctx, enum AVPixelFormat pf);

 /** sets the memory allocation function and logging constants to av versions */

-void vs_set_mem_and_log_functions(void);

+void ff_vs_init(void);

 #endif