From patchwork Tue Mar 13 04:46:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 7956 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp332719jad; Mon, 12 Mar 2018 21:52:51 -0700 (PDT) X-Google-Smtp-Source: AG47ELsc5XUrpGFH1uN8l49TRu7fXjJJ9rcJhc32AXkQMyeZPw5ed5btLf96vrgPPJRLqSlqkJvZ X-Received: by 10.28.182.212 with SMTP id g203mr6988089wmf.155.1520916771726; Mon, 12 Mar 2018 21:52:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520916771; cv=none; d=google.com; s=arc-20160816; b=aiUoXbhnPZi81Epy6sICpoeHRx8GiLJraDcLiFanWDVQFjsVFqS2k8siqIpghXDTHs t0VCI9cf7EtAn2JplA3MZYx3UOM9jkzIarEbAG/8P7BNZVCl/rl76pMyauIxY5mAh1PM bZKWKCuZIce8pUzpQknd2qHMML3wLhqhwsCD0AtlSt9GcWyHEwEkc4XRWVwq2PWF5UhR yJ8Zjn1OcpUcKeoGUk9pwfBMKUaMcvSsr73N4nvCmU/C8zh2j9bOb/IbG6Of2PudFrrE 4Qx8yZ40xSGYAaVfDivt0qEBiJsRZx9A7dv5O1dxbHhYjrlK6KBH+HlMPB1Rgg/28soH XVvg== 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=g4Ll872G+a+m99s5obG2Xv1C9E8HOV8bZ6wWtMfKXSM=; b=0sizQReTsl40VduGaSIwQo6ghi52FmYy5tCXpjlvoCkjJTT9+1Q+yK4IWEWwE3FJ5/ Txvj7CdEOcEKzs7PA68R6FihaMUhKLBZx0EaOKgFP+nocvT1YJAHDppofbD2UY8o8EpZ arXBycNhLYDgnToxj7gKKpzIHjeg/vLB0OT9vqSsos85zN09FaFY0PYk+LMsp97zR7uo bzXi0y1LGDq6tnWiE5zgfzMBzLIHklvtFKDibKRLywuFiwvVsEbUt5FP87f7vWTI4KIo 0V0zw8l4V2hT+wODd7r8W9JbhBMkfF4k+K04e88lI2Lol1Bo6kJlVvyZxZF3+NVBhaqS SMSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nITaSP30; 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 j43si5784626wra.202.2018.03.12.21.52.51; Mon, 12 Mar 2018 21:52:51 -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=nITaSP30; 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 84217689E69; Tue, 13 Mar 2018 06:52:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f52.google.com (mail-it0-f52.google.com [209.85.214.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1482A689BDF for ; Tue, 13 Mar 2018 06:52:33 +0200 (EET) Received: by mail-it0-f52.google.com with SMTP id j7-v6so14505842ita.3 for ; Mon, 12 Mar 2018 21:52:44 -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=ucjwGXES9cn4VnPWB++IU9UD2GNQTarNBHZjQZ9CNIs=; b=nITaSP30vBRMgyU5YYw8qc8g7+L2oK3GqB11orSBJ3TOOM950AnVKQv2w9ZnqJPzk8 715XdyAWdxpN5XXOWXybIewvvDzOJABZTG95Xm2A+hwh8a7OISntCH9ovMz91n92QMld 3djqeXJThiLG6q7Un59TLoeTiJJXnG6/BC1ZZDdQUIWmseEZ1zld5t6hhgx5Nm+48Mzo 6qwwyFJdusMfaal3+/lv9uavwXlkD6BhnrEnkJ6tsEx1aQDPk7Xd0XH5wZzknMao70Gq 46XdIATQDPdjAbhuJRkYO/SytB7yKUm5LggYai/FCi4tH0zdRdPEEWQIZSyZskxUFO4a 9lAg== 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=ucjwGXES9cn4VnPWB++IU9UD2GNQTarNBHZjQZ9CNIs=; b=VEpXksuZ+xJ4ofg55ZPk2nbRSkRZoNpWuHBP7qyVwpS9psCSLibuD+Vfch0pKgcYg1 U9PeYYyfSqGH/aTw32OFixvIELM2ClTtipguejMUcgr6ln/h+/vc/FN7UNcvbXTSAA2/ xcrbfcwj9VslZvbEVy3TY+8C3L4C0tUqjyQkZwRAtKP6JrI4Y+Dg9IfT29Vf/4QTH8q1 gTM8KNGFYtAdNxDHA2YP4ZQeDpSYntNkzAO7Q03lujRJxvy4C2Sx62WSmXy3Vo/XC1ow WgGJs53oXfwhh9j7nBNGfU3RFNhc6WukJZu3iaJ692PSml2IAkY9VRz8gjoTqhiP7Z6d Uyag== X-Gm-Message-State: AElRT7EdUkaOLPO3sFWy+sWOEb8zmZw0hbzcgv+bgBFcJHosCjk3lTE8 ASQVrIA+1gvS9E9OV5dIj6OM1q3x X-Received: by 10.36.189.67 with SMTP id x64mr11887424ite.134.1520916414065; 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.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Mar 2018 21:46:53 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Mar 2018 23:46:46 -0500 Message-Id: <20180313044648.40735-2-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 2/4] 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 353a42ae2c..d4bc4e8995 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; }