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 588AA48AED for ; Wed, 1 May 2024 19:02:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 62C4868D737; Wed, 1 May 2024 22:02:21 +0300 (EEST) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4365668D733 for ; Wed, 1 May 2024 22:02:14 +0300 (EEST) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-6f30f69a958so6132474b3a.1 for ; Wed, 01 May 2024 12:02:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714590132; x=1715194932; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=HwEY8UrfOFHnmWtpqh3o34ECNxmaASQRs/EDeocqEIA=; b=ei85x4UxwCk9bK8LxdBObEkkYPhGMKcdBI+9KL8XP1R2cA7FwGMzwrR+WR1TFrUVKu rjG6yA66HBXvzLuy9kNx77djt1LKg3PXlNuLC4+/bl/537sr46GuKs1htcdEqijmlg0I 0eXU7EcIZZKeIF+IDV8IEJF+OB9nv8UqQlYLKzbX+wAngl376d1Eeux83EMPydQ551mB JpjMVal55lQzVOyoEyj6Tj+ZHSYGBHEJdsGqQPhKrkk5X7eMpXPxKY7uL+9tSh+z3uHz RHCSKIiNWfQqDtb5eWjeUXxUUmuniyKvX0zJR282j6NHoNT1irG3+MyDloPokzvsUpVV 2n4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714590132; x=1715194932; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HwEY8UrfOFHnmWtpqh3o34ECNxmaASQRs/EDeocqEIA=; b=NkqDOECaqNtWKRKP/4+by+djGPLfYF65qNlRfM1As5D4Zmc2+UGWGL8aqcpnD6/FYC /bB6TfON2wZR0ytkbyav1wNhb4Wb2tVrPc2PqVSjCFFHttKFNm7+YEi1yeQgcKQf3q5w 2zYmBnlSWJJQmlrjXPqtXPPFXpQf7B4fn5p7VFdTOHwkZGn//DPD4u8B4tb2YvIN+nGg nYWCtdl/BOT5TbBsL3ye7sJWhZ1VbMze9rbdxpgbCaIfXzJpAMChNA026DqvMb/YbBON D4V8S3C+WisnDY5/P1nAMc16ykskgOjNLtMnhmnruzOQz9A5DMntXBF4stnpiwx22Pw9 pxaA== X-Gm-Message-State: AOJu0YzjQWerXZSKKCliyZfewk4xLmqAlW8Pgbebv21WtD/zEBShiugg rj1jMDOZWwfESmkMrPcoLnXA5yU9SceLXGV7bpVJOjZ7o30KPjYUM0BiUw== X-Google-Smtp-Source: AGHT+IHzFHqBqAs67S7ezeGWfIWqHF9TfVVP5xYSZRQBhvgoIKZGOSLwbKr4ymkcJWyVUwuDR2Pm4A== X-Received: by 2002:a05:6a00:4fd1:b0:6ed:caf6:6e4b with SMTP id le17-20020a056a004fd100b006edcaf66e4bmr3918490pfb.18.1714590131530; Wed, 01 May 2024 12:02:11 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id g14-20020a62f94e000000b006f2d97c3e87sm16867184pfm.125.2024.05.01.12.02.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 12:02:11 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 May 2024 16:01:55 -0300 Message-ID: <20240501190156.36095-2-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240501190156.36095-1-jamrial@gmail.com> References: <20240501190156.36095-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/avcodec: don't free coded_side_data in ff_codec_close() when decoding 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: It's a user-set parameter shared with AVCodecParameters, so it should only be freed by avcodec_free_context(). Signed-off-by: James Almer --- libavcodec/avcodec.c | 11 ++++++----- libavcodec/options.c | 4 ++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index fc8a40e4db..e560efff6a 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -458,11 +458,12 @@ av_cold void ff_codec_close(AVCodecContext *avctx) av_freep(&avctx->internal); } - - for (i = 0; i < avctx->nb_coded_side_data; i++) - av_freep(&avctx->coded_side_data[i].data); - av_freep(&avctx->coded_side_data); - avctx->nb_coded_side_data = 0; + if (av_codec_is_encoder(avctx->codec)) { + for (i = 0; i < avctx->nb_coded_side_data; i++) + av_freep(&avctx->coded_side_data[i].data); + av_freep(&avctx->coded_side_data); + avctx->nb_coded_side_data = 0; + } av_buffer_unref(&avctx->hw_frames_ctx); av_buffer_unref(&avctx->hw_device_ctx); diff --git a/libavcodec/options.c b/libavcodec/options.c index 0c3b40a186..7c32a71275 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -177,6 +177,10 @@ void avcodec_free_context(AVCodecContext **pavctx) av_freep(&avctx->inter_matrix); av_freep(&avctx->rc_override); av_channel_layout_uninit(&avctx->ch_layout); + for (int i = 0; i < avctx->nb_coded_side_data; i++) + av_freep(&avctx->coded_side_data[i].data); + av_freep(&avctx->coded_side_data); + avctx->nb_coded_side_data = 0; av_frame_side_data_free( &avctx->decoded_side_data, &avctx->nb_decoded_side_data); -- 2.44.0 _______________________________________________ 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".