From patchwork Thu Dec 26 10:53:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16978 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 2BF7F44AA84 for ; Thu, 26 Dec 2019 13:02:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E15168AA9A; Thu, 26 Dec 2019 13:02:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 600FB689E39 for ; Thu, 26 Dec 2019 13:02:10 +0200 (EET) Received: by mail-ed1-f65.google.com with SMTP id c26so22305629eds.8 for ; Thu, 26 Dec 2019 03:02:10 -0800 (PST) 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=FcqrPGg7iRiHkvshIXixiuQ3uS+kVdPVxxID6+s+o0I=; b=tt5YATpbCu11hLZ8fI2oG3lYgDVjyO5SEyKWkfQ1khU6iAWcSiqHKzQpM3wXo3iTa+ Z9oJ2U9to7Tqlm+s0TZFFE09QPHN7umnykePowE/UULYHw1fMZLJE+QdZFN3SEtRNmVB QNBjK4kTO5hkiNu+SiQ3OW/vOAVMQA64L0mDtisAnk9sIxeoVNe6yOVs6kik3VFN+aVP QqXWorfGHR+2npHXQ8epZMVHwoXJbdbVmw+eKi+i+/kCq3dTpg03PpxqfYcgXrQ4jM5b L0QsrUGivZNIJph7Abc7WH0caGDP/Fr7j2sip+nHJxwMH7yrQ723wr52SFU4qhQa6p2a zIuQ== 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=FcqrPGg7iRiHkvshIXixiuQ3uS+kVdPVxxID6+s+o0I=; b=skEBR/9VQycgy7vtPZmwhfMV1emcsmztTUiKg04T/d6vkU6f8c6Jy1/bWXKq+l8Azc 3ZxICeIdOCuvu6Dp0Er+Zjlhu46F+yKtDmzEE5+f1xvnY3KvvN9qnp1vSGlpspxBP4fs b875HewuoGerpbdBNqdSErjxxov/2eG95hwxAx8qOCjvKmFb0WXSVJJ6bgBnDcVPbm9y 95PMqgifZqZ5fiMmYL0pvDfvpkxzjL9bC2te38RfJ20q0KR41vdcifwvw0CuOsFxQ7fA 6sxWO3bMNzvX7tosplC4T7WBJ1vdA+5H6e+IyomvBilDFbNTb8gmhsrrdLXsZYa9WyIQ vNWw== X-Gm-Message-State: APjAAAUvMXuI3FApzf3RpDf4D7yytoUleZSEqJVVEzNmSdp1fHY2BH09 qWJhQKe/tHDgpYRjMa4oKwJ5ekpG X-Google-Smtp-Source: APXvYqzzZff3nS389gzEJUuQdsAmCFoVpGXnr6fkvTZSf4Lcxo7KMVdgMFENF27yc6EU6FYy/n4j8g== X-Received: by 2002:adf:ebc3:: with SMTP id v3mr44002614wrn.280.1577357650665; Thu, 26 Dec 2019 02:54:10 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc10203.dynamic.kabel-deutschland.de. [188.193.2.3]) by smtp.gmail.com with ESMTPSA id c68sm7997618wme.13.2019.12.26.02.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Dec 2019 02:54:09 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Dec 2019 11:53:32 +0100 Message-Id: <20191226105342.11175-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191226105342.11175-1-andreas.rheinhardt@gmail.com> References: <20191226105342.11175-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/17] avformat/webmdashenc: Remove write_trailer 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" It doesn't do anything: All allocated blocks have already been freed in write_header. Signed-off-by: Andreas Rheinhardt --- libavformat/webmdashenc.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 26b8727304..d2f0e0ec4d 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -550,12 +550,6 @@ static int webm_dash_manifest_write_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR_EOF; } -static int webm_dash_manifest_write_trailer(AVFormatContext *s) -{ - free_adaptation_sets(s); - return 0; -} - #define OFFSET(x) offsetof(WebMDashMuxContext, x) static const AVOption options[] = { { "adaptation_sets", "Adaptation sets. Syntax: id=0,streams=0,1,2 id=1,streams=3,4 and so on", OFFSET(adaptation_sets), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, @@ -585,7 +579,6 @@ AVOutputFormat ff_webm_dash_manifest_muxer = { .priv_data_size = sizeof(WebMDashMuxContext), .write_header = webm_dash_manifest_write_header, .write_packet = webm_dash_manifest_write_packet, - .write_trailer = webm_dash_manifest_write_trailer, .priv_class = &webm_dash_class, }; #endif