From patchwork Tue May 19 10:46:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19771 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 E1F7644B01F for ; Tue, 19 May 2020 14:10:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C956D68AA69; Tue, 19 May 2020 14:10:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1429268A636 for ; Tue, 19 May 2020 14:09:59 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id e1so15429983wrt.5 for ; Tue, 19 May 2020 04:09:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d13PE0ZOeov0Dm4tecdsVNivVRuGeXcB1hPqxIbFiuc=; b=W4L8k2uweGlpPtQZKxxDfKh5jzsktzMavSWFl7rEdLFdYoh72CwkCU2puDMax1+wwn PRqKrn9KU+N0oEr/NIHifyYq2Scb1JqoAqMHQCLkVhNxvtIN4ALvsfg4kveRcMDesnzf ZanU7dHpAODU485rDTgBB1B/ux2SQQyM4YB6px6Z5FYbBsWCXq897FjG7LmltfpeT7h7 7AHreRNphPmyn1B+BYNZ5kpeoEz0VIXeVAXE5JaY5guZsE/oGDLKdZAVHZxiARIGbG6c md6TO+n2ZffrDcHmbuSjDPO3KJj3U26qJsC6kW29133T0+M5o2MR008K9akIFFoOcGpS zdWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d13PE0ZOeov0Dm4tecdsVNivVRuGeXcB1hPqxIbFiuc=; b=Py2ljQ/z6Jxey4Fg+k/oJHXex33xM5Aaj4/5pFkkS7DGhLi7Zic2B7R8oRvxg/urSm ctKt/XErTptpyKY2TIioWp+LIjlc8fpNPnPkIF9SqOwcTLSfSJeWZMzz1He6cxOmmHyP QBIbvymICBAyoKR+6BEmorK/pX8rRqVzGSAhmwKtUzjC2cZ4c2dlz+XcfTZo9B7G7iCj 29S6Kv2B+h/X4POH+Xa/A3T+jkUViiabEaSW7YsqKvS8tdhpY7gsEU3OJUcK80kMYm7b 3n93euO/7GIvBJk8tltxz4pD7vbFi7J2UtQbQv3uDB7rbVo40Nie0bY7dPJVQBW7JAA9 BGSQ== X-Gm-Message-State: AOAM532liX0zECNbOmiRwdr1PBxuW9e9QFP6PESSmAHIa6lcmwSX7lzG 5zcjkPdo8+2svf59fHwuPenOsfN/ X-Google-Smtp-Source: ABdhPJyBQHLg3VRdsMjQJSJ8c8a6KWNA08PgdDlIioZwAwuKtGPLOWXluzKOaWqa/aj6qFrGqoFzQA== X-Received: by 2002:adf:f8c1:: with SMTP id f1mr24792695wrq.171.1589886598223; Tue, 19 May 2020 04:09:58 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id m23sm3511998wmg.45.2020.05.19.04.09.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 04:09:57 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 May 2020 12:46:01 +0200 Message-Id: <20200519104601.12817-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519104601.12817-1-andreas.rheinhardt@gmail.com> References: <20200519104601.12817-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/hls: Remove redundant resetting of pointer 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" ff_id3v2_free_extra_meta() takes a ID3V2ExtraMeta ** so that it can already reset the pointer. Signed-off-by: Andreas Rheinhardt --- libavformat/hls.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 89386ea1b7..3e35d157ad 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1969,7 +1969,6 @@ static int hls_read_header(AVFormatContext *s) avformat_queue_attached_pictures(pls->ctx); ff_id3v2_parse_priv(pls->ctx, pls->id3_deferred_extra); ff_id3v2_free_extra_meta(&pls->id3_deferred_extra); - pls->id3_deferred_extra = NULL; } if (pls->is_id3_timestamped == -1)