From patchwork Wed Feb 6 00:36:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niki Bowe X-Patchwork-Id: 11980 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 1B949449098 for ; Wed, 6 Feb 2019 02:42:30 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EBB3C68AAFB; Wed, 6 Feb 2019 02:42:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f48.google.com (mail-vs1-f48.google.com [209.85.217.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C034168AAFA for ; Wed, 6 Feb 2019 02:42:23 +0200 (EET) Received: by mail-vs1-f48.google.com with SMTP id t7so394926vsq.5 for ; Tue, 05 Feb 2019 16:42:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=5DU9WtRR7Wil/riy8W25OsHvq6ha+NLai8ifF+DWTfk=; b=F/xNwjTzKxjFTjF9HynfHFqVNTCo1lNFHbaAXNVwqhfu/0DrjkT2BEfGFjU12jyvXa 7bcjAk2HnXj0Rhk5CiZQt5H0QT82geQ/gAFsUlj1zjDI+vzTtKvPEBCYrnE9jNIqYKUc oKuyw0SD7ocYwL8sMQ6OiDeMq1CxtmXa3Z1RhQgmVqkG8xYVrNljhliLLuG/OEkZm0mx He90CiCSZLEZhR7jLVOOeaFNajvF7GiCxJ6FsIsMO3B4oK0hraGX1RIxogENPuVdGSKa LlmgdPinbHCHnDcU04KQhzuK7Fptyb6Nb+HPoQ/dF+cEM9Au8EMiczTB2SEjyolZgiHu cy+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=5DU9WtRR7Wil/riy8W25OsHvq6ha+NLai8ifF+DWTfk=; b=ZFkGCekbJYrX7XSXRLrWjfotateGqxCsFG/YlIaLIxyK/u/pFby/E51m8FRQ3bt1Aw BxOu/DOzDrIAOEd+D2d4/5sGcOV/6fG3xJCFzRc1SKHvD3a13rmvKP6UQ7rt7TUdNElz SU1OMuhIip6qKsFlg9RiC5FxhxFKu8nbR2C6uKJJeoAHfnl2TijStVXLg/ziKVywTmTP 7azKAGgUgxMebeb7o3iRswQWseWele/LNxWXejSAVxwgiepSCZu9EJh4IKBBA1upigCK iBfVs9XRpVuGIs51aj0QEaayTCvGl3nQEZd+oy5iMcfZDC+rhzZC6AQWHD8KXBkrxKpc A/TQ== X-Gm-Message-State: AHQUAubbRpcAUhj5jpO8tRd5JFsPuRYE2gt2uyA+QGlnhgFfLOsE/EFj y+pwSUnUh840Cv1kAbSlAeUsqcQgPVl/HpWI6OKR7UQlvWs= X-Google-Smtp-Source: AHgI3IZkH6FGh46RWp6zAB06ovfKK1D0nNJcrEjhNfTwLy+xI31Lmtbp4Rn2B6pE4JpHeG+jNd0441Sig4tpToWyaJE= X-Received: by 2002:a67:1203:: with SMTP id 3mr3276736vss.207.1549413381064; Tue, 05 Feb 2019 16:36:21 -0800 (PST) MIME-Version: 1.0 References: <20190205021135.221078-1-nbowe@google.com> In-Reply-To: From: Niki Bowe Date: Tue, 5 Feb 2019 16:36:09 -0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH] avformat/movenc: Fix muxing EAC3 with delay_moov 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On Tue, Feb 5, 2019 at 4:33 PM Niki Bowe wrote: > Hi Carl. > You are of course correct. > Attached replacement patch. > > > On Mon, Feb 4, 2019 at 6:24 PM Carl Eugen Hoyos > wrote: > >> 2019-02-05 3:11 GMT+01:00, Nikolas Bowe : >> >> > + if (mov->tracks[i].eac3_priv) >> > + av_freep(&mov->tracks[i].eac3_priv); >> >> I would have expected that the if() is unneeded, no? >> >> Carl Eugen >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> > > > -- > > Nikolas Bowe | SWE | nbowe@google.com | 408-565-5137 > From ebb9c55a6f11d70e16dca4dd3d05ae36fb5737b6 Mon Sep 17 00:00:00 2001 From: Nikolas Bowe Date: Mon, 4 Feb 2019 17:31:08 -0800 Subject: [PATCH] avformat/movenc: Fix muxing EAC3 with delay_moov When using delay_moov mov_write_moov_tag gets called multiple times. Therefore we need to keep eac3_priv around for subsequent calls. Signed-off-by: Nikolas Bowe --- libavformat/movenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 65be2968a1..00ad318943 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -579,7 +579,6 @@ static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track) end: av_packet_unref(&info->pkt); - av_freep(&track->eac3_priv); return size; } @@ -5956,6 +5955,7 @@ static void mov_free(AVFormatContext *s) av_freep(&mov->tracks[i].vos_data); ff_mov_cenc_free(&mov->tracks[i].cenc); + av_freep(&mov->tracks[i].eac3_priv); } av_freep(&mov->tracks); -- 2.20.1.611.gfbb209baf1-goog