From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id F25B140FC6 for ; Sun, 13 Feb 2022 00:25:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B86A268B283; Sun, 13 Feb 2022 02:25:27 +0200 (EET) Received: from mx.sdf.org (unknown [205.166.94.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 980AC68991B for ; Sun, 13 Feb 2022 02:25:20 +0200 (EET) Received: from cc976dd952578dabee563e248880c159 ([1.136.185.231]) (authenticated (0 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id 21D0P9R4010273 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Sun, 13 Feb 2022 00:25:14 GMT Date: Sun, 13 Feb 2022 11:25:04 +1100 From: Peter Ross To: FFmpeg development discussions and patches Message-ID: Mail-Followup-To: FFmpeg development discussions and patches References: MIME-Version: 1.0 In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH 1/6] avcodec/vp6: Check initializing VP6A context X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="===============1409375408217869337==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============1409375408217869337== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Io0+TEojUu+lawsy" Content-Disposition: inline --Io0+TEojUu+lawsy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Feb 11, 2022 at 09:47:43AM +0100, Andreas Rheinhardt wrote: > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/vp6.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) >=20 > diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c > index d75e717082..95ed5eba0f 100644 > --- a/libavcodec/vp6.c > +++ b/libavcodec/vp6.c > @@ -654,11 +654,12 @@ static av_cold int vp6_decode_init(AVCodecContext *= avctx) > if (s->has_alpha) { > s->alpha_context =3D av_mallocz(sizeof(VP56Context)); > if (!s->alpha_context) { > - ff_vp56_free(avctx); > return AVERROR(ENOMEM); > } > - ff_vp56_init_context(avctx, s->alpha_context, > - s->flip =3D=3D -1, s->has_alpha); > + ret =3D ff_vp56_init_context(avctx, s->alpha_context, > + s->flip =3D=3D -1, s->has_alpha); > + if (ret < 0) > + return ret; > ff_vp6dsp_init(&s->alpha_context->vp56dsp); > vp6_decode_init_context(s->alpha_context); > } > @@ -745,4 +746,5 @@ const AVCodec ff_vp6a_decoder =3D { > .close =3D vp6_decode_free, > .decode =3D ff_vp56_decode_frame, > .capabilities =3D AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, > + .caps_internal =3D FF_CODEC_CAP_INIT_CLEANUP, > }; > --=20 > 2.32.0 patches 1-6 look ok to me. please apply. -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B) --Io0+TEojUu+lawsy Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQSpB+AvpuUM0jTNINJnYHnFrEDdawUCYghP3QAKCRBnYHnFrEDd a85wAJ9m09HifG+xQnvVn6Pkzp84kJQipwCdGCYfJHh5dlMgPPSQ6AqT2XBun98= =PTgg -----END PGP SIGNATURE----- --Io0+TEojUu+lawsy-- --===============1409375408217869337== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --===============1409375408217869337==--