lavfi/vf_*_vaapi: Fix error case

Fixes CID 1452400, 1452416, 1452550, 1452590, 1452760.

diff --git a/libavfilter/vf_deinterlace_vaapi.c b/libavfilter/vf_deinterlace_vaapi.c
index 72d034981ab4cb8d0d91cc3fd39cd3b4c2770875..71809eb01a890b9470a43b4aff3cb793687c5c93 100644 (file)
--- a/libavfilter/vf_deinterlace_vaapi.c
+++ b/libavfilter/vf_deinterlace_vaapi.c
@@ -239,7 +239,7 @@ static int deint_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame)
 
         err = av_frame_copy_props(output_frame, input_frame);
         if (err < 0)
-            return err;
+            goto fail;
 
         err = ff_vaapi_vpp_init_params(avctx, &params,
                                        input_frame, output_frame);

diff --git a/libavfilter/vf_misc_vaapi.c b/libavfilter/vf_misc_vaapi.c
index 54516d7e356d8e51c242c56da2c0bca82e3fa4cf..5814ff8c2ed424a4c1c01cf2719fbddab731303c 100644 (file)
--- a/libavfilter/vf_misc_vaapi.c
+++ b/libavfilter/vf_misc_vaapi.c
@@ -145,7 +145,7 @@ static int misc_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame)
 
     err = av_frame_copy_props(output_frame, input_frame);
     if (err < 0)
-        return err;
+        goto fail;
 
     err = ff_vaapi_vpp_init_params(avctx, &params,
                                    input_frame, output_frame);

diff --git a/libavfilter/vf_procamp_vaapi.c b/libavfilter/vf_procamp_vaapi.c
index c3e9866f227e137139354b31bf05f0d3c951dcfb..7342048583e669bdfbe63fab5ea99d7cedd8ff24 100644 (file)
--- a/libavfilter/vf_procamp_vaapi.c
+++ b/libavfilter/vf_procamp_vaapi.c
@@ -150,7 +150,7 @@ static int procamp_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame
 
     err = av_frame_copy_props(output_frame, input_frame);
     if (err < 0)
-        return err;
+        goto fail;
 
     err = ff_vaapi_vpp_init_params(avctx, &params,
                                    input_frame, output_frame);

diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c
index 8298a013da43a881a4473ac8e018ebe9d6a83e8a..b9a5eeff65d60b2eed1b061382a9dae7139d990c 100644 (file)
--- a/libavfilter/vf_scale_vaapi.c
+++ b/libavfilter/vf_scale_vaapi.c
@@ -125,7 +125,7 @@ static int scale_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame)
 
     err = av_frame_copy_props(output_frame, input_frame);
     if (err < 0)
-        return err;
+        goto fail;
 
     if (ctx->colour_primaries != AVCOL_PRI_UNSPECIFIED)
         output_frame->color_primaries = ctx->colour_primaries;

diff --git a/libavfilter/vf_transpose_vaapi.c b/libavfilter/vf_transpose_vaapi.c
index 69dbdd70176f9c42e02b25f214543278477a83e6..a4c654266de4712c1eb699172cb5395a58ce55fa 100644 (file)
--- a/libavfilter/vf_transpose_vaapi.c
+++ b/libavfilter/vf_transpose_vaapi.c
@@ -145,7 +145,7 @@ static int transpose_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_fra
 
     err = av_frame_copy_props(output_frame, input_frame);
     if (err < 0)
-        return err;
+        goto fail;
 
     err = ff_vaapi_vpp_init_params(avctx, &params,
                                    input_frame, output_frame);