From patchwork Fri Nov 17 13:30:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 44698 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a20:b0:181:818d:5e7f with SMTP id e32csp578691pzh; Fri, 17 Nov 2023 05:30:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IFP7Mg/NqJ6qlozhuXw8xHbmIqO0tr6wNsVcQTspbJO0XRjtv8o8cMv76iG44/maYFnR7Bn X-Received: by 2002:a17:906:4c59:b0:9e4:716:4e32 with SMTP id d25-20020a1709064c5900b009e407164e32mr12872604ejw.11.1700227833932; Fri, 17 Nov 2023 05:30:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700227833; cv=none; d=google.com; s=arc-20160816; b=z4MkJFOD/YmQMZM39yey6rty6iMadtCWWsZMJanxg3mTTj978XTyscm8wEUyQmMq/q RJ/IB9EgXbkNbcibFb3GXGxHFr1duMcfrVvEs8JRL/n49O09Tju7TEaBnAJnAewfxdo5 WFF/OHVSfZOIMiY/b8mzvSXAeQGgv30iLTCBi2yyOul3NaqdFpxq3mI4UgKdhcv7I7oS zSzpUSf3EBrDF73jOiArJ4bCmjfpbMpxlORo3ZEmA8eiAMRzC1itiUIt2Gf2mlu9IAn0 ctLLGtVERQ4LuIMDFvzhEVxI62/q4BCRE3udFf1fpYyhclQhB/OW5MIuVlT7/LKCJa9/ Eg5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:mime-version:message-id:date :to:from:delivered-to; bh=T3xjxqCZszD7F+oypJtbQ4rV5a07RULi14tME+xMXEE=; fh=w8JR1T/5WquwCqgnlKgniZcITMXOtCHDzF0NyyyGKZI=; b=RBt6ozui+Nl0YCq4YNxdODqVKwKDK/+QtKQvL9hhNpffqiwXw4JcERsx86T1LWUACe 9hTGdVFpdvJQbC6Q5F9p0AU3FGwPiy9ju0mi32U+IPypMi+8v38uj9DC49g9omfhz/rb ZeCS/q0L1189y/1vauND9BbT5f1YSFzt4Mo9W/SDY6lPTwjhQfqxKZLO9ktqP2YufJvH CDPlbV4FoqHegt+AoBknxM5ntCRpAzMc8QEcudnnaa+kjnkQKKMhh+C/jL54dbx8xXqU +oQPkVThIusoae6L1IR61FLoGzobt6aOAacoPr8vcwYoJJSZ6m8r4R1RikU9Esy/eLvT zeBg== ARC-Authentication-Results: i=1; mx.google.com; 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: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id br22-20020a170906d15600b009d098285c23si910750ejb.787.2023.11.17.05.30.32; Fri, 17 Nov 2023 05:30:33 -0800 (PST) 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; 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 2E9D468CD27; Fri, 17 Nov 2023 15:30:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgjp3.qq.com (unknown [54.92.39.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22D9F68CCF9 for ; Fri, 17 Nov 2023 15:30:19 +0200 (EET) X-QQ-mid: bizesmtp69t1700227813tkv5913p Received: from localhost ( [221.216.148.250]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 17 Nov 2023 21:30:11 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: C46Rb8GPIEdW+d+o96m0cqicHCljijw3yrfBtrFIEnunxtvwRmOejAurhvXmK n4o5nxLMyg1DUK/+XoxeHT7/GftJ6d7meTgMgZEnZDJTUaXmbGCPdmGp/qjw9bcSeqVhSef 5mY/TM1adDoNIwEcoyUN1jqUJV5s1QfdomfRIcnbqa/ekZVO6/bm8Bj4og+m9ubGBzIh2Bl SvVR5VZRr481/JSci7Goc5bxiTMP+5ZOXlHCpvzzwaQdiBTR5PQvvjYat00soffof0Pxjro 40RDJQkg6vBxqB1jF/XrRgBVKoI9hXMqusEm8Z4M+76PmhBuGIKlFuxwIqWcQbFUq+JXBxY UiciyORNZOvGpQBnh4MUwT3fNLTcrPGRrGtLS+K3kJqOI4VIBuoL6Y7nmG6c/eBg1oiYTMh X-QQ-GoodBg: 0 X-BIZMAIL-ID: 7592350863948286599 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Nov 2023 21:30:09 +0800 Message-Id: <20231117133009.66968-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.39.3 (Apple Git-145) MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybglogicsvrsz:qybglogicsvrsz3a-0 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: remove unnessecery av_dict_free operations 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 Cc: Steven Liu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2t4p95ajJujJ The option will be freed at the end of the hls_window function, And will go to fail label call av_dict_free if every open operation return failed. Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 7049956dd7..27f558abd4 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1588,7 +1588,6 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) set_http_options(s, &options, hls); snprintf(temp_filename, sizeof(temp_filename), use_temp_file ? "%s.tmp" : "%s", vs->m3u8_name); ret = hlsenc_io_open(s, byterange_mode ? &hls->m3u8_out : &vs->out, temp_filename, &options); - av_dict_free(&options); if (ret < 0) { if (hls->ignore_io_errors) ret = 0; @@ -1647,7 +1646,6 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) set_http_options(vs->vtt_avf, &options, hls); snprintf(temp_vtt_filename, sizeof(temp_vtt_filename), use_temp_file ? "%s.tmp" : "%s", vs->vtt_m3u8_name); ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename, &options); - av_dict_free(&options); if (ret < 0) { if (hls->ignore_io_errors) ret = 0;