From patchwork Mon Jul 3 01:18:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4194 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp8783048vsb; Sun, 2 Jul 2017 18:18:39 -0700 (PDT) X-Received: by 10.223.146.1 with SMTP id 1mr28839370wrj.152.1499044719884; Sun, 02 Jul 2017 18:18:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499044719; cv=none; d=google.com; s=arc-20160816; b=KnUIrCq6RgWjSHDYFdvMkA7UO8INAYuK6dg2KppxF7vWFpwM8HpPz9GUS21cb/Xjop Sjt31VPWSHAeEZhweIs5A3YmTgABLJighg43TvTPqE9QPQuQArhAL08LV3Q2yUgOyBhu iBlzPU6/eDu7rrFh7mM1SsaHOPN97xRyBVW5fmqhN7qW61uxNmluWHCnrumHF11wwZ9/ uLj0ORDgM8a9Di1+TtmgGwdcGNTeb2mgu0XcCwklGAiHaxCl0HwkiA0LFATAUIeXXzLd Od3uHjgtL286RNPEmHo/N+VVEvgjhoE4eMIxKU3FzereXtngdSRrBRFDinmzMRJ37hh0 +XQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :in-reply-to:mime-version:references:message-id:to:from:date :delivered-to:arc-authentication-results; bh=I200jmnS8a9Jrtz40rJeLvHf46PdqV7LCRW8wp7EC8o=; b=n+t8jRo0EamYZQpQ//cJKTBTYLzU0DkLW6fVee2CoKZHz7IQWxU5047aI+4w4UK243 PtQcQS49455Eg0An6kTOSQMuVpF9yPGAArGPJJUOTj/RO2Gdpbh1+S6GfzDzTp2EC3KL Y2sv3VHcao1CBVtLkheVE3oT4cp9b6jJi0reEITDRRmiUEJhM7QiKFAjNs1SFhRbLuQ0 PYKA0NlQr6jKZckGOlXqvPOHbcuUC9GCGgIkL7atwW/eGOMVvJWej77Q0w9soAMDMtEa erDoiYtyUxypdnVdHLUDIDXAkzQ80PKshpYXqYGoXxeLTfsDxq6WmCPcMEDjiQ/hGfKp ybEA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h18si10164209wrc.69.2017.07.02.18.18.39; Sun, 02 Jul 2017 18:18:39 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 38CC9680AA2; Mon, 3 Jul 2017 04:18:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2C2268053E for ; Mon, 3 Jul 2017 04:18:29 +0300 (EEST) Received: from mfilter14-d.gandi.net (mfilter14-d.gandi.net [217.70.178.142]) by relay6-d.mail.gandi.net (Postfix) with ESMTP id D9D15FB88B for ; Mon, 3 Jul 2017 03:18:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter14-d.gandi.net Received: from relay6-d.mail.gandi.net ([IPv6:::ffff:217.70.183.198]) by mfilter14-d.gandi.net (mfilter14-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id 2xPimCOjh3R2 for ; Mon, 3 Jul 2017 03:18:29 +0200 (CEST) X-Originating-IP: 213.47.41.20 Received: from localhost (213-47-41-20.cable.dynamic.surfer.at [213.47.41.20]) (Authenticated sender: michael@niedermayer.cc) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 6567AFB89F for ; Mon, 3 Jul 2017 03:18:29 +0200 (CEST) Date: Mon, 3 Jul 2017 03:18:11 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20170703011811.GR4727@nb4> References: <1498664522-44645-1-git-send-email-derek.buitenhuis@gmail.com> <1498664522-44645-3-git-send-email-derek.buitenhuis@gmail.com> MIME-Version: 1.0 In-Reply-To: <1498664522-44645-3-git-send-email-derek.buitenhuis@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [FFmpeg-devel] [PATCH 2/5] movenc: simplify codec_tag lookup 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 Wed, Jun 28, 2017 at 04:41:59PM +0100, Derek Buitenhuis wrote: > From: John Stebbins > > mux.c init_muxer() already sets codec_tag correctly in the cases > simplified here. > > This also adds the capability to support alternative tags for the > same codec_id. > > (cherry picked from commit f6f86f432fe51526a7aad2bdb025d6a45d239883) > Signed-off-by: Derek Buitenhuis > --- > libavformat/movenc.c | 68 ++++++++++++---------------------------------------- > 1 file changed, 15 insertions(+), 53 deletions(-) breaks fate TEST copy-trac3074 Test copy-trac3074 failed. Look at tests/data/fate/copy-trac3074.err for details. [...] --- ./tests/ref/fate/copy-trac3074 2017-07-02 00:09:52.091619495 +0200 +++ tests/data/fate/copy-trac3074 2017-07-03 03:16:18.208151309 +0200 @@ -1,4 +1,4 @@ -39aef1afff761d673fd1be07182941d1 *tests/data/fate/copy-trac3074.mp4 +364bdfb3ed40bf4a3517f978f6b7b9e3 *tests/data/fate/copy-trac3074.mp4 333991 tests/data/fate/copy-trac3074.mp4 #tb 0: 1/48000 #media_type 0: audio