Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / ffmpeg / libavfilter / vf_vidstabtransform.c

diff --git a/src/third_party/ffmpeg/libavfilter/vf_vidstabtransform.c b/src/third_party/ffmpeg/libavfilter/vf_vidstabtransform.c
index 80968ae..1bd43ff 100644 (file)
--- a/src/third_party/ffmpeg/libavfilter/vf_vidstabtransform.c
+++ b/src/third_party/ffmpeg/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);
@@ -207,7 +207,7 @@ static int config_input(AVFilterLink *inlink)
     av_log(ctx, AV_LOG_INFO, "    interpol  = %s\n", getInterpolationTypeName(tc->conf.interpolType));
 
     f = fopen(tc->input, "r");
-    if (f == NULL) {
+    if (!f) {
         av_log(ctx, AV_LOG_ERROR, "cannot open input file %s\n", tc->input);
         return AVERROR(errno);
     } else {