> -----Original Message----- > From: ffmpeg-devel [mailto:[email protected]] On Behalf > Of Decai Lin > Sent: Thursday, March 21, 2019 17:30 > To: [email protected] > Cc: Yan, FengX <[email protected]>; Lin, Decai <[email protected]> > Subject: [FFmpeg-devel] [PATCH v1 1/1] vaapi_hevc: Fix double-free issue. > > From: "Yan, FengX" <[email protected]> > > Signed-off-by: Yan, FengX <[email protected]> > Signed-off-by: Decai Lin <[email protected]> > --- > libavcodec/vaapi_hevc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c > index 19aabcd..373ffc4 100644 > --- a/libavcodec/vaapi_hevc.c > +++ b/libavcodec/vaapi_hevc.c > @@ -271,7 +271,7 @@ static int vaapi_hevc_end_frame(AVCodecContext > *avctx) > > ret = ff_vaapi_decode_issue(avctx, &pic->pic); > if (ret < 0) > - goto fail; > + return ret; > > return 0; > fail:
I believe this should match the behavior in vaapi_h264/mpeg4/.../vc1.c, and remove the redundant ff_vaapi_decode_cancel in vaapi_hevc_end_frame(). --Linjie _______________________________________________ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
