From patchwork Tue Mar 13 04:46:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 7958 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp332403jad; Mon, 12 Mar 2018 21:52:21 -0700 (PDT) X-Google-Smtp-Source: AG47ELs/ZLWSSScw6UgYH7l8e4va6KbGdDt58SqfQCYg+2bfv1pORMbv/Y4ymELZqjmS4HegOWdV X-Received: by 10.223.155.129 with SMTP id d1mr8513504wrc.8.1520916741237; Mon, 12 Mar 2018 21:52:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520916741; cv=none; d=google.com; s=arc-20160816; b=xkzyhoIsWkN4ETN783/fVu34bY15tVJujt8C3ponOnnCxrtQifXYNbcmg7MWYPkWzw ViEY+/GezvL+1nGRVum56nD7SiFiyWqRj5JGlB3fKSvlLrCcDDG4zSa0Y2H4llSsRMAb gpH9906M4Wdp78/Uob5fQKpIaqTLtAdw58R/GGdVQF9OuSsUyBeTPS1HvSLDQ1O6FJg9 pvBytQm7BG05rLLxwg1n7TSgKIkfZfM2utmixd7+ed3kqkiJjrBWPPyPBBzGgBR4Hn5g HTgpIsaGG3dWPa1kIjRuI3A6aBjLQTAqnhUX+M1uCflc9y0AAJCC6VY0Dw1CQbLDiF4K 3xJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Gj+sq6ksmZMcg7SLBm2Ux8EZi3e6UZqhf3YqmAZHFsI=; b=WGFmYmWv2y+Gn/RzKCZvdmJ3zHVat8SXUUrG14ZJZFKipcwGtE7llUWKFBlpjUFLXq EV/FSYbZeeR5g+Ge2wSlpX/dVn4Dh4QkHLH85VoWdJcWpu6pCLne49HEWpj1fh4uugBH dl16gFaJfHalIpbLM/VR5pR3seGF9puY9flNsQmebXZUDb1TQKgvngmif5E8FZ+X/7Jt hcT59VxoCMCrJLLoK2PPXn12KHF5EQbNz95iG3bXz4CqHAyyJUMIg5gCcA3zXlqcCQ6q brwEO5QCs+QHowONa7QdFL1FOiPjBxsJrBGOX4RNJhBvX2LlZISLjYnCkY+ydPYuPGIz lYOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HkrsrIpf; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h92si6284709wrh.383.2018.03.12.21.52.20; Mon, 12 Mar 2018 21:52:21 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HkrsrIpf; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D86D9689B7C; Tue, 13 Mar 2018 06:52:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f67.google.com (mail-it0-f67.google.com [209.85.214.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44D10689B7C for ; Tue, 13 Mar 2018 06:51:55 +0200 (EET) Received: by mail-it0-f67.google.com with SMTP id l187-v6so14480321ith.4 for ; Mon, 12 Mar 2018 21:52:06 -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; bh=lnNsGA91bEvAaVBQYM4Yoi9uE5+7SDV0lp9eP3FBTPY=; b=HkrsrIpfOjt2atwkUM+jkkSXhZjE24TeAp0CqI1i6Uu8Kilfe67juJXePtuUx7HhMU FB00Cs4sBWI7Pv2VWN3TP9P/9irZsCUGTgv/yMGBbJGyZI6dkUE1bAek6JChtynut8qp 9eCTl+WyTjw/C6S+fj5Zej6BapDDFi1FbRQY+Db4MVdDwEHblcJFGE/yRxbhFah8brf0 cGqpC7xAFcvkHhogySBVW3e5u0pS7EdzPltStRtN1FJFtLnpkkqpQo8cFjjU0Zythofh /sAQWrvppWrItb6tvZEZHKZ7ELI65nF7LuNmvnItsHAwSf+ogw00uRT+XpR2+DdtRw8Q Mf1Q== 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; bh=lnNsGA91bEvAaVBQYM4Yoi9uE5+7SDV0lp9eP3FBTPY=; b=Oky8oCYrIXuuhk7ZnmhobMakxmNmfyDCOgRPFsCdQ00pIrDZ6L1RtJOp1/xcRNK/So gJATHdU5GLrCyDIIFIderT//4c3oBAXhSnuXwyFhtppQCjDgcTC6sd9+pV+md6gVfaNx J+YnbauD3GFDSEImNVb+Aamg5HXmT83fhwigSuDsINMe6/n4VwIEYGVvgqsDP9/wbZCX aVjOBV8HTpmkgrgeya3jIAWTHqaFWjQ/We8ix2cZghPP9pxRxbgIJhBe5Jty+097n90v 2WjjWbbHl1EKfpRDf92uryjF/roo3MYIe6PYfMbFSwkhgID/IDqBV9fOq65nd98mlF3R 5RMQ== X-Gm-Message-State: AElRT7Fc5RBhZ3x03dgUyWAwhT/4RhJHurH9y8GBpuAvCx328iieZi3e BSQ2vSf9ro0PvweTwrE4hh/5e+Nz X-Received: by 10.36.74.148 with SMTP id k142mr11792425itb.115.1520916414834; Mon, 12 Mar 2018 21:46:54 -0700 (PDT) Received: from Rodgers-MBP.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id e22sm585120ioc.1.2018.03.12.21.46.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Mar 2018 21:46:54 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Mar 2018 23:46:47 -0500 Message-Id: <20180313044648.40735-3-rodger.combs@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180313044648.40735-1-rodger.combs@gmail.com> References: <20180313044648.40735-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] lavf/dashenc: remove unneeded call to dash_free 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/dashenc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 79d63e52d4..5689aef811 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1030,10 +1030,8 @@ static int dash_write_header(AVFormatContext *s) int i, ret; for (i = 0; i < s->nb_streams; i++) { OutputStream *os = &c->streams[i]; - if ((ret = avformat_write_header(os->ctx, NULL)) < 0) { - dash_free(s); + if ((ret = avformat_write_header(os->ctx, NULL)) < 0) return ret; - } } ret = write_manifest(s, 0); if (!ret)