ffmpeg | branch: master | Mark Thompson <s...@jkqxz.net> | Sun Sep 29 17:46:04 2019 +0100| [593106ff475e77a6d630a4fec1bc974fa145b9fd] | committer: Mark Thompson
lavfi/vf_*_vaapi: Fix error case Fixes CID 1452400, 1452416, 1452550, 1452590, 1452760. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=593106ff475e77a6d630a4fec1bc974fa145b9fd --- libavfilter/vf_deinterlace_vaapi.c | 2 +- libavfilter/vf_misc_vaapi.c | 2 +- libavfilter/vf_procamp_vaapi.c | 2 +- libavfilter/vf_scale_vaapi.c | 2 +- libavfilter/vf_transpose_vaapi.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_deinterlace_vaapi.c b/libavfilter/vf_deinterlace_vaapi.c index 72d034981a..71809eb01a 100644 --- 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, ¶ms, input_frame, output_frame); diff --git a/libavfilter/vf_misc_vaapi.c b/libavfilter/vf_misc_vaapi.c index 54516d7e35..5814ff8c2e 100644 --- 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, ¶ms, input_frame, output_frame); diff --git a/libavfilter/vf_procamp_vaapi.c b/libavfilter/vf_procamp_vaapi.c index c3e9866f22..7342048583 100644 --- 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, ¶ms, input_frame, output_frame); diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c index 8298a013da..b9a5eeff65 100644 --- 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 69dbdd7017..a4c654266d 100644 --- 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, ¶ms, input_frame, output_frame); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".