From patchwork Wed Mar 14 06:24:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 7985 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1636107jad; Tue, 13 Mar 2018 23:25:28 -0700 (PDT) X-Google-Smtp-Source: AG47ELtRNU7QYR86xFaxE5kOV7IlN6l9M8k0Tjo0NEz/mBbd+2Njnxa8jY81OgRP0zaUnBKJvvfk X-Received: by 10.28.69.93 with SMTP id s90mr581868wma.29.1521008728150; Tue, 13 Mar 2018 23:25:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521008728; cv=none; d=google.com; s=arc-20160816; b=AqxxyLYb8OvPhmafPJqeXLcmZs+HXAKH1wKJ369XiaSbHgfJcANvsczZESrfw48/fM IpADtHiFsIMXuco8GtIPkkp1oc2yIqieyKCD+1pzcZZGUyWGnJwvaSVokcqR19DJLcE1 4ax7qwjs5jVsScoXvWRmKJXYnW3kUuD8sp+I8KzLl2rp4Jmw/siPMlte1x583MlJvoci AiLqHc4bzFH72XaimtUSooUAtV9CunMP4LEJh9+TUE/ErL2b/4b2AMoroymVRXgJLPEo iW3fkf4Tbj9Doo0Yxf6TOuAM+CLUYprErLd0LtrUGv+EbXGzd3cIT79T10tKqTLs6JsQ JA8A== 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=oYtG7BlBsN62gZsIEpS15bcIKW5roLrFvXcCJcEXnbJfvdxXE8+tq4YliXScHdNYws cxMv+JpRJnpLzXomilENCHD8RdtvYaoeXcUv4UMhyZokbAFF1ixVqK9v/KvXP8jBI2qv mK0JqKW/Wj3s+ppFJa2csFUnzwoAOMiCSBMs70N6FvKiL0IbokoFTiJLDSxvbcRUHJl0 ur+Rht/6/b956Ie2OaKMelvPgy2HRlUyHM+nbEHfLvKn1Pga1TDCRcOvgBfI7UDrmkmz yH707TQvku3axSqub7KTpI8qgDm+myAASin+wfOFhl+uQdb18fOMLEwDYch9qzvLV6oF o1xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IlOdLWeN; 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 13si422589wmn.4.2018.03.13.23.25.27; Tue, 13 Mar 2018 23:25:28 -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=IlOdLWeN; 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 513EF68A039; Wed, 14 Mar 2018 08:24:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f195.google.com (mail-io0-f195.google.com [209.85.223.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93B1D689C46 for ; Wed, 14 Mar 2018 08:24:42 +0200 (EET) Received: by mail-io0-f195.google.com with SMTP id e7so3032572ioj.1 for ; Tue, 13 Mar 2018 23:24:54 -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=IlOdLWeNJaqnWdFKGAWz6lrner9GTWJFF9YSwtgutoHkfFWOBFwRvpm+RjH5vbBXDo QP+ImXuiQN4hwh6GehQ1HPX7e/XJPucYr6Ka7n3NsQAg8YcgtqVgKqwOaZDvwjNb/1vS h+oqIf5D2Knw08q/PzTXKNnQ0/odMlvVsZakZWfa1Yju3tBy3f5PlhuNEZGay5GsMZ8E +oFaSkfy2kE0b74JjGY/IHMh3AjJUnUskbWXKpn9PJ+uro1pxhZ1ZOUCq08Bzk+H+7Ev aFcwx0MuPDkSCqPiIw7vKmhdKF4itIRgI17bDu8EMZq4OKQ+ckkR/I1FwkXVxL6TDXYq PvRg== 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=oNDRBe0U0UzecnbHtykBbZ4Q75yKnciiyiLXIp4F3X5XCKjqVM1JSrZHQ8T8U8jB9h XsNv5YAIvDs12j0PwJuCROhtF2cUn+cTwad1WtzMpunF+zPC7cRtNCp4DSCtOcU3/D+N 2LMcjRX3LJX8QGnY8lUW7qys3O8xS8N0/M025k+DKHl7TIJU6HwiTeEVoOeK3cT5XFWy nzWyW6WxpLxPDi2/1ZKmCD76BaVLx+zLZItKbG4fph+ls9ZBHU47bZoQJrMXa3sP2j0D deYS50qxjEor+9HxFWgo2jl60bZnLvBb4L3BwZvDhd+N0CHTHw0eLqKFaRjapy/3RDni jwXQ== X-Gm-Message-State: AElRT7EV6IDRL/TgiDSACKF8YD43L8UHkdGKao9B53xQWjw1695FH2Nu puOmgTC992fk6/mxUuf5vufTocjB X-Received: by 10.107.182.67 with SMTP id g64mr3759459iof.58.1521008692658; Tue, 13 Mar 2018 23:24:52 -0700 (PDT) Received: from Rodgers-MBP.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id v134-v6sm394596ith.27.2018.03.13.23.24.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Mar 2018 23:24:52 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Mar 2018 01:24:39 -0500 Message-Id: <20180314062445.89909-4-rodger.combs@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180314062445.89909-1-rodger.combs@gmail.com> References: <20180314062445.89909-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 04/10] 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)