From patchwork Fri Jul 10 21:01:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 20953 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 7BDA144AB4A for ; Sat, 11 Jul 2020 00:02:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 62B5D68A370; Sat, 11 Jul 2020 00:02:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f67.google.com (mail-qv1-f67.google.com [209.85.219.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 591DA689AE3 for ; Sat, 11 Jul 2020 00:02:09 +0300 (EEST) Received: by mail-qv1-f67.google.com with SMTP id m8so3232431qvk.7 for ; Fri, 10 Jul 2020 14:02:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=74bNXnQ9jCFCBLKrO+88z9ZFDPEETnWaNutVZMpuVDU=; b=qNA4CVJpQeYSglpvvAolz+CvsneWDr594Sx0nLFFiFlx7VzUgCmXP2SWKx5oEHFXD0 vADo+qnNvOFOIb9w6dRdjmTHwimt8EvcgN0IZLpX0VTHQ8WU/CrnjG10B2qGzgHKQQ87 FqGsv+SNSgp4L1AWuNf6i294GqbPao+2BQ6THtOKjZpm5+RxNLe95YIJW4Nn1UP1Tnj2 6A+s7PI3XfBghHaql89ISEgWj2SM9zwNdwlYkmTO237YttjGltHxK7v4Q2ezfeFkzUYt ILny1iFl1cxRPDV14DSTVf6pJbmX5EXCwsEhxMbQIcKwxsNbg7WosnD6NQiW7SYs0K6x MfhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=74bNXnQ9jCFCBLKrO+88z9ZFDPEETnWaNutVZMpuVDU=; b=e/J613EXA1FeT3lob1bIKHhZ+kKQRrAlkWZ43R9iczYhxSW1KpOc8+7f2UPwFp+0h5 /jFj9zFydMDF23DRJ+uImMud4T2Wg1A3FZzx/nqWmPPKt3uU1ZCrgNuOidS9WrwUzYLf 26nJeCD2W4Sx2hGfNe77LK1+MmJvfB8hpuFmTdkeVukCTJHfNVsN1n4s2fsxHROOPNyZ JRDlWtZn9bB+TDRef6K2XTKAGciO34gEcDJuacGXT0xHpKWVTlVsAmi9YazB1ASJQCfs pCE5v3/bP16ExqL7c4gHmSpK5DqCQOuoUwRbSfUyqI7MfgMRrW1/OsXFI95Fdvnfs/Vr 9Mzw== X-Gm-Message-State: AOAM533aLp1dpT36nMcF55eFdbNKn/Xxl99LUVtfdhb5hegE/QXt2jpf IwpCBr9z8ckfvREKIu3B0ViWk9wg X-Google-Smtp-Source: ABdhPJxuUiGW4vEa+vCmnvaYl/S2nWe+7nMzRP26xesPTVMJ1DmRVp3CJYPbOSbSPBhCJ1GJxPrq5Q== X-Received: by 2002:a0c:f0c8:: with SMTP id d8mr71174068qvl.217.1594414927322; Fri, 10 Jul 2020 14:02:07 -0700 (PDT) Received: from localhost.localdomain ([191.84.244.216]) by smtp.gmail.com with ESMTPSA id w18sm8679346qtn.3.2020.07.10.14.02.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 14:02:06 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jul 2020 18:01:49 -0300 Message-Id: <20200710210149.6969-3-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200710210149.6969-1-jamrial@gmail.com> References: <20200710210149.6969-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/libx264: call x264_param_cleanup() if available 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The documentation states it should be used to free any memory allocated by x264_param_parse(). Signed-off-by: James Almer --- libavcodec/libx264.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index b39b89b565..0c30bfe895 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -511,6 +511,10 @@ static av_cold int X264_close(AVCodecContext *avctx) av_freep(&x4->sei); av_freep(&x4->reordered_opaque); +#if X264_BUILD >= 161 + x264_param_cleanup(&x4->params); +#endif + if (x4->enc) { x264_encoder_close(x4->enc); x4->enc = NULL;