From patchwork Sat Aug 29 17:56:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21989 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5A07D44AD75 for ; Sat, 29 Aug 2020 20:57:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F905689E13; Sat, 29 Aug 2020 20:57:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2126D6881EF for ; Sat, 29 Aug 2020 20:57:05 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id b79so1870734wmb.4 for ; Sat, 29 Aug 2020 10:57:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DHnIIzG4+KnZcmG0PK0FQCSoTJspifi8d/6i0JCAQas=; b=qMiorzGOemOglSG2vt/CHzalUPMvgGxtfww/U56mJb8gvEwZ4PySicDZchEYroAVOp kC3taSN0E/lAy8/jPybfbkIioAJEaAiijROhK+EuRCcarb+Fu3yJFbs5AHlTbZ7Ge/pp aFJJBTvVUZ+J9A4rpZIJiDj3OzrCtWR9S7cJUJbAir5V0jetbgLBCvaqReTSInsi0k2M Q5KsUSiYPsJvvNOKAzAM8u+lntslrBvuL8ZEsx6ggQFfS9S4t6w8AgDCS3ymptoscr1b wPTlTsMNnTMau5HGxGJk/DnC9zzvpnTq4HoTiRRdyA8Kxu2qftEWtSyVtaTpcn064z5l PEgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DHnIIzG4+KnZcmG0PK0FQCSoTJspifi8d/6i0JCAQas=; b=H6FavCOcWckDK4BDA5fTNK8KgFv3QePwq/TI5AY+faZk0YLqcoG+mnT/6+SaDTQHJm 0/6HZGme2VjwteCGvP2uYNG8vuk9Z/MQXlaKnGBMqPC36q+UVSvf4ajqqqXasWRYPWcb rKEWefdD0BSQY7f6OZMFZsKUOrIdKUqHW8g4jc0szSmuSum8mAxHJPM1VaPE/oNhXnAf fkvG82K9zGYrZX6E7MvzvgEXHFSpWNDSqNBVqd/4hXj+I+H8NjI734QdtDJVl+Tgt++s cxy8+zl+Og173Hrm/4ncF6Bi4MM0MRJ51lC+ACuX1NHcWoNHApiEzBPSa76Ut3e3TnGq x3ZQ== X-Gm-Message-State: AOAM5316yj222FCKZdrnYv1iM27wPS/5pBAvat7ntiALhtW5bZtrnBdV /CgZjf0oUU1vtcrM6nq/ZRKEJOBqmbA= X-Google-Smtp-Source: ABdhPJw5Bix6jh3r1GiuCJcAxUvld+c8uhoe0EBLCQR5Gn1Pqp/EC2kZRGOzqjeaqi/RkGUPvO/8KA== X-Received: by 2002:a1c:6087:: with SMTP id u129mr3860342wmb.157.1598723824324; Sat, 29 Aug 2020 10:57:04 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z8sm4016734wmf.10.2020.08.29.10.57.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2020 10:57:03 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 29 Aug 2020 19:56:16 +0200 Message-Id: <20200829175626.11682-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200829175626.11682-1-andreas.rheinhardt@gmail.com> References: <20200829175626.11682-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/13] avcodec/interplayvideo: Cleanup generically after init failure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/interplayvideo.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index 274641c3d1..58400b6ace 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -1160,7 +1160,6 @@ static void ipvideo_decode_format_11_opcodes(IpvideoContext *s, AVFrame *frame) static av_cold int ipvideo_decode_init(AVCodecContext *avctx) { IpvideoContext *s = avctx->priv_data; - int ret; s->avctx = avctx; @@ -1175,8 +1174,7 @@ static av_cold int ipvideo_decode_init(AVCodecContext *avctx) s->prev_decode_frame = av_frame_alloc(); if (!s->last_frame || !s->second_last_frame || !s->cur_decode_frame || !s->prev_decode_frame) { - ret = AVERROR(ENOMEM); - goto error; + return AVERROR(ENOMEM); } s->cur_decode_frame->width = avctx->width; @@ -1187,12 +1185,6 @@ static av_cold int ipvideo_decode_init(AVCodecContext *avctx) s->prev_decode_frame->format = avctx->pix_fmt; return 0; -error: - av_frame_free(&s->last_frame); - av_frame_free(&s->second_last_frame); - av_frame_free(&s->cur_decode_frame); - av_frame_free(&s->prev_decode_frame); - return ret; } static int ipvideo_decode_frame(AVCodecContext *avctx, @@ -1381,4 +1373,5 @@ AVCodec ff_interplay_video_decoder = { .close = ipvideo_decode_end, .decode = ipvideo_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_PARAM_CHANGE, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };