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 C28DE4636F for ; Thu, 15 Jun 2023 15:20:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D9CE68C58A; Thu, 15 Jun 2023 18:19:14 +0300 (EEST) Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C825968C570 for ; Thu, 15 Jun 2023 18:19:08 +0300 (EEST) Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-6b2d9ea4901so4781902a34.1 for ; Thu, 15 Jun 2023 08:19:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686842347; x=1689434347; 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=q7Zfm5g45ucMTE3fWsbTzmGFGwUZZUFu1Fa6itcWwHM=; b=al2DzGJklzIUtUc05fp5YuVUPDRFLQ6VScCfSVRn/DINDjeWQXjt9swBqfpuwtyjlb u+U7TP2vMR7HEaxQQJYWBgzfgCeSEQJE5JoPKMN83O7glXxn0hqCy2zIObnbtAvxVyav wo12uRwkmRLPk7MYWd9m4Itr05BRCzkk/vQv1ZobMs2eDg1Ck7dhTRhYYUw32qPR+sfs QQPA+29M0z+bq9Z23/ZN/g7MQW9OZyFnzTJCin3S5IZ9WBVdFYQIXr4Uzw8Qm1fEhLgb ggJt3/wTh0uuIe67nOwoxWNTLXyoq2tpXRifq+9iuycHIQhboqL42/yMWFCPRMN0qwIq 1Qsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686842347; x=1689434347; 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=q7Zfm5g45ucMTE3fWsbTzmGFGwUZZUFu1Fa6itcWwHM=; b=hKPzGwYI8n1fOG/ZnL2SIzVBseSqYLep2IuBKW4rqjEsxlTQmW+gAvMZF1fXgYGLmv p6ccOAMRcXHjY7abKaa1fM8XQ5om5+TilhBDUkVIUQwmql0RHA7QjfVy29nGlCOO1HIP g2R6/RmZYqCXSSZyZWjSnzSKeBdFKZhf1TIje63RAF5npACwYd4AkqTDXo6yGSqKLrJz jJK/LL4MM+WV+lqY6FKzvNvBPDyStwmYSXIsOrcVN9vh4nynjJCqWNxpv7Smj8VEVDKX rRHEx4nPL9En4Od+kMZ5t9V3N1JSyFn+FJS+lbKYScPvh3rEHLBDTTLCXbiBp3+q6miL 7bTg== X-Gm-Message-State: AC+VfDzRooHjFRa7t3yxzJs22Zm8yE8uPLmYH+cHRD/R4fsrWif8IlxH NAAXfGw4HMre7JMc6rI9djwjLrnPWR8= X-Google-Smtp-Source: ACHHUZ5oHVzKvmN9k45zS7seUq1fwFa5WTLK9reZ6C0p8o5GE3EHbS0/kk9EYpKO8fYMc7m+al8HbA== X-Received: by 2002:a05:6870:42c6:b0:1a3:74d:cdc7 with SMTP id z6-20020a05687042c600b001a3074dcdc7mr13666221oah.5.1686842346886; Thu, 15 Jun 2023 08:19:06 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id ve17-20020a0568710c1100b001a6a3f99691sm4748405oab.27.2023.06.15.08.19.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jun 2023 08:19:06 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2023 12:18:35 -0300 Message-ID: <20230615151836.50535-11-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230615151836.50535-1-jamrial@gmail.com> References: <20230615151836.50535-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/11] avcodec/evc_frame_merge_bsf: free EVCFMergeContext on flush and close 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: Signed-off-by: James Almer --- libavcodec/evc_frame_merge_bsf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/evc_frame_merge_bsf.c b/libavcodec/evc_frame_merge_bsf.c index fbb344490a..7cc701f5c5 100644 --- a/libavcodec/evc_frame_merge_bsf.c +++ b/libavcodec/evc_frame_merge_bsf.c @@ -60,6 +60,7 @@ static void evc_frame_merge_flush(AVBSFContext *bsf) { EVCFMergeContext *ctx = bsf->priv_data; + ff_evc_parse_free(&ctx->parser_ctx); av_packet_unref(ctx->in); ctx->au_buffer.data_size = 0; } @@ -129,7 +130,7 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) err = AVERROR(EAGAIN); if (err < 0 && err != AVERROR(EAGAIN)) - evc_frame_merge_flush(bsf); + ctx->au_buffer.data_size = 0; return err; } @@ -154,6 +155,7 @@ static void evc_frame_merge_close(AVBSFContext *bsf) EVCFMergeContext *ctx = bsf->priv_data; av_packet_free(&ctx->in); + ff_evc_parse_free(&ctx->parser_ctx); ctx->au_buffer.capacity = 0; av_freep(&ctx->au_buffer.data); -- 2.41.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".