From patchwork Wed Mar 14 06:24:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 7980 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1636023jad; Tue, 13 Mar 2018 23:25:19 -0700 (PDT) X-Google-Smtp-Source: AG47ELskbgV1Yar9mguokLr2tRnFbkcBGxVglg4SxP7gESLzOy+S3nH8ea2odo4XP+skUn0syT+b X-Received: by 10.223.168.111 with SMTP id l102mr2834527wrc.84.1521008719296; Tue, 13 Mar 2018 23:25:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521008719; cv=none; d=google.com; s=arc-20160816; b=NOmUTJc+2buRYmejWso9LDf9Uao4sLAjJ71JOtyvSzr0UdhG6x+SZLWu8+UyRhFBfD 8Ai1H8yUwsziqG+2uqyYs1xk/XXQje993bixsZz4SSlF0JvNwkgjOYO86DUBTsUl6LhG ujdx/ZQIpUMk3uDVmo/Fb0dBu+bAJJAyByO9Bfgmif5oAygkCN/FpMFrP99amBJPeXzD nIsIVcXUQrc2kF2DAXs2cE3/so0TJF/f5vxfj8Ukh0VtZI8LTjXeudiyQxPEpE6xeTIF Tzd7H3GhtCYseDe+gD3ImIhu/poQMO6JDkc7VvL9KM5Itw1n2iI4hbO286tSOoGLzkJI v7pg== 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=GCK9GUUH4g/bVa4/P3upx41yS+c9FAgEx3WVELOkj9k=; b=n4Y4v3fj1g52jWigUoUHgipfuUdZG7pOnqim/eKAC5i6/Puuii2987N27K8ppItBll WFeIdCGKVnJjtfO6vl4Zf1o9UTxZq7AJW6sb6k+QomMNHWspYbkksSDQ/SsGw2nNoLFz dtAa1dJn953qxK3Sfsv58hSpzIID5/4hiRQxpK5u27dOdEjpY1AXs0QsjmZNssDHPwu7 hH8i+PKGPCuRRP7rOJ6xhf2M3Zb8WgAzBAoRlxvFYVp5P7qELT7sLBIIgClCx32LWGXR cd3/oehJOAT4NvVTxGUDdxgucTxWjtKRtUcZm4Clcc95S/FyQki5rVqVKpBDXoN8mHsY vcWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=AamgKy9B; 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 w189si386769wma.171.2018.03.13.23.25.18; Tue, 13 Mar 2018 23:25:19 -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=AamgKy9B; 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 A291F689B5C; Wed, 14 Mar 2018 08:24:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f179.google.com (mail-io0-f179.google.com [209.85.223.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EE75689A66 for ; Wed, 14 Mar 2018 08:24:41 +0200 (EET) Received: by mail-io0-f179.google.com with SMTP id d21so3009755ioc.5 for ; Tue, 13 Mar 2018 23:24:53 -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=VkugwFE2RIRJQy4oek5mde9iu3RDdTmwLHuN5zvNoZ0=; b=AamgKy9B4G+7xvGdcX3N3wNEP0MSFMcqX16CMDfINSPaX+kFCsGuBD7KwPX30VIiny 68m8F6qjI2qtXdJKTv8UaX31rBELl2r0Cf5L770UArJlFL3i4PjcAVhcRVex4/oONNuc WJAm1EolVXdoXC/77ETCE+wpPm9G3PEB2gCniZS1v8RcdRmh3falJS4dFcrVGlBJo7fM IKuX9YZkFyCdvJY8yqlLd/hRcE4WIo4xFb8Q8r379KTCgATjfUSVjaRkNlCn8R+HXc3U xzuHUTp/IPQ7Nf65Di4AnXOuQYbVQlFgNbbZi3IMmVpO5NSI1ljCYKOhniBbxe6gv3a9 Mbpw== 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=VkugwFE2RIRJQy4oek5mde9iu3RDdTmwLHuN5zvNoZ0=; b=VKx52m2LOUBlS5Bl46m2szxEMPBe0JUv6fcdPtnUU4ezb6GuItLs6Lg1NTZluRpHNR cllAOGhn+3nMW6+BRh7b3lQn6lVwyFDBSZ6MbZZMsbJxMcWZd60L4eqJChKlv/rd91s7 lpfTRb3633vvvnPq1be4HQQ0d9BO6TEg7PqyXN3lvWtB1hmZdTxwX6e/4Idzm/vPalX7 EI1g+kl1JTHdECW8fK1opApUDg1TFRe3u/FyJFqFLoTgB6xW/SO/LYFHN2IP7WFmCu5S mhZrv2TdzxO+BvFRkcA/soxSlKnq5gU6Xu5yiUz/nga94LJWjYLxjSZxxDQrAWSL4Yh0 1JkQ== X-Gm-Message-State: AElRT7EX88U2RUVd7NfA5SroeOhvzoUPQs9ejHG53Aapr1c8q460bLI6 eKs0EJ5L7ZFl//A1XKEznANyEUkF X-Received: by 10.107.140.86 with SMTP id o83mr3411006iod.127.1521008691740; Tue, 13 Mar 2018 23:24:51 -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.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Mar 2018 23:24:51 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Mar 2018 01:24:38 -0500 Message-Id: <20180314062445.89909-3-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 03/10] lavf/movenc: keep eac3_priv around; fixes eac3 in DASH 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" DASH muxing sometimes calls mov_write_eac3_tag multiple times on the same stream. We need to keep this data around so it's available in the second call, else we won't write the data QuickTime needs. --- libavformat/movenc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index accab417f6..b5ef09c4c7 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -554,7 +554,6 @@ static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track) end: av_packet_unref(&info->pkt); - av_freep(&track->eac3_priv); return size; }