Message ID | 20240607130135.9088-38-anton@khirnov.net |
---|---|
State | New |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1012960vqo; Fri, 7 Jun 2024 06:10:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXPk0yShPV2D3381jTFRfm1YbpbxISa2p4wLtghtvYE7DT9Wby30g0mosIMBpVvWd0KTzKY97qEtQmWkb/rM3xKgWyMZd1waGXxVg== X-Google-Smtp-Source: AGHT+IEe4PllldZG9m+rxf28cVnuz4fgEVlBuMct9OpQuV/epBw7nyx1i4UoG60O77inqZUo2gVS X-Received: by 2002:a05:6512:36cc:b0:529:b6e9:79a7 with SMTP id 2adb3069b0e04-52bb9f853acmr1760701e87.35.1717765826878; Fri, 07 Jun 2024 06:10:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717765826; cv=none; d=google.com; s=arc-20160816; b=yPLl3To6t2YMqUORGPCQ7Zx1ZJ/KSiX97LMrVZThgIoa+0b9MWun78FwAE9TOdr6Am VFWpymnc6MINPtF0cVDEajrIdm6BAhxww+ecc1svWGNGrSkC68JW9uUcZciS7v4RAV77 zod7sbOuqZuVniup1/SzBeaFwivXFsxBwCx6pp0yvrY89FW7AqNyXZqKuGwBctdLMLDK AmpPWffakg2urtM3gAbH1F44FnkItddMI6Zo3ldyfzazURVhiBrcK7mZlt52gEKcir8p /f7z4tYw8ebOXgyBc09Vh050blqZzZlW1rg5q1kbgwHqhLYE5OYTwH2bmHHCGHeWUPnH IDEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=OK8g+YN9zS38ABumEXHZwCP6UZgy8n6DM3YzwWdD7rU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=z7jf1neP1iQMssxulhXYI8ohniZCLuuIwPIXXt8i+emVcxtPOqHkZMh/8906mYiMN6 XRqJViRw/bnqiHJji4m8LU4tqQ9LfhF+ryWOJfY7R5Xr9Xt8T9kt4lbNs1F2C+8ieG5q XeK7YM3b+HAyxk/37klql5fTUx4lgUd7n6aLduI6A3W0MMlYtY3/6a04YES3ldbFIl3z hEIKfyadF7jxm27GRLTbIcbTEmOc992QeCg/2/CY3/BWeYXPTIfnVvnT61V5csq//HNb Fz/eHlYW/CwBMST+dzrnawTffZepGeNtAEQ0yZltYx3cv+6kZMxoT7PB7YY/dzjvT/Vl wPig==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=Mr83E5TG; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a6c80588909si190756666b.196.2024.06.07.06.10.26; Fri, 07 Jun 2024 06:10:26 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=Mr83E5TG; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7B51368D88E; Fri, 7 Jun 2024 16:08:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C5C468D851 for <ffmpeg-devel@ffmpeg.org>; Fri, 7 Jun 2024 16:08:45 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=Mr83E5TG; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id EAFC04DBA for <ffmpeg-devel@ffmpeg.org>; Fri, 7 Jun 2024 15:08:44 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id Ag0BeuBd-uWp for <ffmpeg-devel@ffmpeg.org>; Fri, 7 Jun 2024 15:08:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1717765724; bh=QyvvVuZBKpKPAq55ghF1ocZgE89GXoTEOmFroai9ZNI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Mr83E5TGXw3xZdmRSls3gONuIuZBVYTUEHC/4aNvde3lkCayYfUHbjXfcy1ZxZVnV msCXdd7Wg/xSxMkKdeBBiLoGwphUv1D85sPYjwv5sKIT84s+XIC5woGLyhgMMcfbzv SGjj/q7AhPhowLE49cmMJyFySD88OnOiwdSm+BM3dYzp6oNVBAYkUXqxX6tkTFYDaV 2CZn8D84j89ne+51X1EFnfybGgUw1OSjlHaKXuSemQ6X2KsyB2Uwo/J4Ohxuv6Oqaj 6/VVB/zgEKhQWyWpWicvAjchtkPPwHVnmf6xG8Lk68ZqeXHnH6hts76awhRDQbmZt5 JgQf3PyIz/dvQ== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 954C74D42 for <ffmpeg-devel@ffmpeg.org>; Fri, 7 Jun 2024 15:08:44 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 21D563A27BF for <ffmpeg-devel@ffmpeg.org>; Fri, 07 Jun 2024 15:03:36 +0200 (CEST) From: Anton Khirnov <anton@khirnov.net> To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jun 2024 15:01:34 +0200 Message-ID: <20240607130135.9088-38-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240607130135.9088-1-anton@khirnov.net> References: <20240607130135.9088-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 38/39] lavc/hevcdec: do not unref current frame on frame_end() failure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: Zd8Wgfxg0//3 |
Series |
[FFmpeg-devel,01/39] lavc/hevcdec: do not free SliceHeader arrays in pic_arrays_free()
|
expand
|
diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index a8c2172674..5fc55d5de9 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -3135,17 +3135,14 @@ static int hevc_frame_end(HEVCContext *s) if (ret < 0) { av_log(s->avctx, AV_LOG_ERROR, "hardware accelerator failed to decode picture\n"); - ff_hevc_unref_frame(s->cur_frame, ~0); return ret; } } else { if (s->avctx->err_recognition & AV_EF_CRCCHECK && s->sei.picture_hash.is_md5) { ret = verify_md5(s, s->cur_frame->f); - if (ret < 0 && s->avctx->err_recognition & AV_EF_EXPLODE) { - ff_hevc_unref_frame(s->cur_frame, ~0); + if (ret < 0 && s->avctx->err_recognition & AV_EF_EXPLODE) return ret; - } } } s->sei.picture_hash.is_md5 = 0;