From patchwork Tue Sep 26 19:54:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 5299 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp4217124jaa; Tue, 26 Sep 2017 12:55:12 -0700 (PDT) X-Received: by 10.28.149.144 with SMTP id x138mr3814885wmd.58.1506455712208; Tue, 26 Sep 2017 12:55:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506455712; cv=none; d=google.com; s=arc-20160816; b=ZeaiY3mZhd0+i4hcTDPY1cnd3/bg9gKT5x0Fnk55IjrPZcw7OBKC00ZBnMGP4PFNVy 07Wvr2p7jyyWpgmUWAYKfLj1bg8VukjPvkx3d/hLcaWBzoQZocoUF1StE7vOJVTK4/bJ uQ892iURdQCQ7uw9lnrPs1ze0ZBnvY52OfRKl5+yibp2PrxfqjJS0pr18qGbSxeUJuWX HbcVKASAb53vvsUt1C5FyiDy0vOkKpP9sUSdWiLowts3JhBcMSVyvB26WY6MFz7bGlm7 vLKdN4JQ2brGAdQXApKlFABiRMaI/hBOqvZw55MW5ldv+EusA/BBEE78j7XYRn+VE+hm srnw== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=HbInOIuStVaRPetfpIpViZvWBYBcPZDDxMbcl+Tm0rU=; b=A3c5snHwbEg7kxZiAmcsfVRICoKyglvBbXZ0YfMuJG+/W7oRE9XZ41AFBRUAZMWsT0 E4Pv2XYaYlRWTSRg4tVH/4/zekG36XdFc2KpheQnTLbZhquSFNoCIisn744P+01Zuhdh JKt8EcHJm+I8IHp0/vhZZFnmN99T9f+swoesmZ9eedknDEkve/0Ztf1HtEvm8xMnuBsd CrlO2OYJsMKZK4t19XiDgume/20Fu+9gATMcynumJug4hm8JizwIjDoVo1OAk52NCTfz sI8/rkz4bIj/yXtBwYMBtITcjRCzNUoW/xczSPSaFTtguzeHCibxUAKAeX1Q9Qi86lET 3HZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HMUUqca3; 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=NONE 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 j10si7750391wrd.321.2017.09.26.12.55.11; Tue, 26 Sep 2017 12:55:12 -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=HMUUqca3; 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=NONE 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 C0C4368062C; Tue, 26 Sep 2017 22:54:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f172.google.com (mail-io0-f172.google.com [209.85.223.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F117A68041E for ; Tue, 26 Sep 2017 22:54:52 +0300 (EEST) Received: by mail-io0-f172.google.com with SMTP id e189so13908277ioa.4 for ; Tue, 26 Sep 2017 12:55:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=XRkQeVbqRnpafY1bbxWKvFKCVcuG/xbCGNEPXS6635g=; b=HMUUqca3wDKfY1v3JkquEVtCP/gUQbtdKGOZxWE3fZCvkTjR3kV7FgDYq9iL0GYrzE u26ub1t8Zn6htkhaFvrMvaPC1k9wwjhUM9YK0FqUQVJ/iplREG044eGngiyemK22290d RFs3H34y+sfSGSkOlBjZw/+IBZ4YRdCbwcymzjCJnD03k88txeSE+5YkHlVmX0cbWzGg UD6MjHdjCBA/wfO4AJBTtyUu5ikVAzOL87D0rt4XeqCRTLLiDwe/1AMBLQtly+UDebUm 0aC1fM8voYHuhD2rkjDhIWHUtyDTuQJRUwkZyjh3+8xPUNu2GuKNxierC5CzC0PwvU2m lMEQ== 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; bh=XRkQeVbqRnpafY1bbxWKvFKCVcuG/xbCGNEPXS6635g=; b=oueEj2u0AcKLk3SaiuTTjEDmm1qBxyVxeTAWd87yN5ez6vpyk6DAXW9JA6iP0r/oBC aALaexEN+ixFfEY6yszf9M47AjjAaTjVhjk523+Iladw7shaOsuTcKI2Tumg/NiMhjku Y3pwQY42DVCUHyspH4Pld5ey7aAkLQgzrPvASGV4j9pK/qMEYA5gQ9VhhvD4jCk9llAC EOvdR+UpZ6sacsM9eIsdpD36TXVj/RZGT/0ZJZo2kueVWEZntqgudVJXnj5rYWfNp/+R 433r9W89QGbD1jp5AR/5Cay5Di3dh16EsjJusLdaKGLSpU477lRwOGPo4WKGv6odMja5 1uFA== X-Gm-Message-State: AHPjjUgUcFXEd/UhvIBNge2MkYsVY8b+5nSzcOyoPLq2Jd/CQceXWyAg Of+2AN7HLcHkbcMcV3rFxCIyACrD X-Google-Smtp-Source: AOwi7QDiREzs3dKEPK5xYlWAJE9pKewGfcCm+rUPzQq9r2TvXEx8hlrAEYwO6ix4fnC2hbLUqHRaig== X-Received: by 10.107.138.104 with SMTP id m101mr17129579iod.164.1506455703344; Tue, 26 Sep 2017 12:55:03 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-75-100-12.hsd1.il.comcast.net. [73.75.100.12]) by smtp.gmail.com with ESMTPSA id t70sm4568914ioi.80.2017.09.26.12.55.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Sep 2017 12:55:02 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Sep 2017 14:54:58 -0500 Message-Id: <20170926195500.88129-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH 1/3] lavf/dashenc: fix merge error (write_header vs init_output) 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 240ff41380..92d398ab50 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -785,7 +785,7 @@ static int dash_init(AVFormatContext *s) dict_set_int(&opts, "cluster_time_limit", c->min_seg_duration / 1000, 0); dict_set_int(&opts, "cluster_size_limit", 5 * 1024 * 1024, 0); // set a large cluster size limit } - if ((ret = avformat_write_header(ctx, &opts)) < 0) + if ((ret = avformat_init_output(ctx, &opts)) < 0) return ret; os->ctx_inited = 1; avio_flush(ctx->pb);