From patchwork Wed Jan 11 18:55:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 2182 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp925899vsb; Wed, 11 Jan 2017 10:56:22 -0800 (PST) X-Received: by 10.28.189.134 with SMTP id n128mr4059223wmf.77.1484160982020; Wed, 11 Jan 2017 10:56:22 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k2si5555217wmg.13.2017.01.11.10.56.21; Wed, 11 Jan 2017 10:56:21 -0800 (PST) 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 D81FE68A507; Wed, 11 Jan 2017 20:56:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27A506808CA for ; Wed, 11 Jan 2017 20:56:04 +0200 (EET) Received: from mfilter38-d.gandi.net (mfilter38-d.gandi.net [217.70.178.169]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id 24EE0A80E4 for ; Wed, 11 Jan 2017 19:56:11 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter38-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter38-d.gandi.net (mfilter38-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id XNpEoi9jBkcV for ; Wed, 11 Jan 2017 19:56:09 +0100 (CET) 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 relay3-d.mail.gandi.net (Postfix) with ESMTPSA id A566BA80C7 for ; Wed, 11 Jan 2017 19:56:09 +0100 (CET) Date: Wed, 11 Jan 2017 19:55:16 +0100 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20170111185516.GS4749@nb4> References: <201701101723.04186.cehoyos@ag.or.at> MIME-Version: 1.0 In-Reply-To: <201701101723.04186.cehoyos@ag.or.at> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [FFmpeg-devel] [PATCH]lavf/matroskaenc: Do not write two CodecID elements for rawvideo 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, Jan 10, 2017 at 05:23:04PM +0100, Carl Eugen Hoyos wrote: > Hi! > > Attached patch fixes ticket #6068. > > Please comment, Carl Eugen > matroskaenc.c | 1 + > 1 file changed, 1 insertion(+) > 41a44b306b4f66f182c30289e093372556ca184c 0001-lavf-matroskaenc-Do-not-write-two-CodecID-elements-f.patch > From b100ef83e257d8a106eefa3d2da9463ccd0e87d8 Mon Sep 17 00:00:00 2001 > From: Carl Eugen Hoyos > Date: Tue, 10 Jan 2017 17:21:08 +0100 > Subject: [PATCH] lavf/matroskaenc: Do not write two CodecID elements for > rawvideo. > > Fixes ticket #6068. breaks fate Test rgb24-mkv failed. Look at tests/data/fate/rgb24-mkv.err for details. make: *** [fate-rgb24-mkv] Error 1 make: *** Waiting for unfinished jobs.... [...] --- ./tests/ref/fate/rgb24-mkv 2017-01-08 23:01:44.544754748 +0100 +++ tests/data/fate/rgb24-mkv 2017-01-11 19:22:58.398776647 +0100 @@ -1,5 +1,5 @@ -94cce0d7d5b14b4c86e74a1ca454c5aa *tests/data/fate/rgb24-mkv.matroska -58361 tests/data/fate/rgb24-mkv.matroska +55270be3b5d393d770a1dfcb19b68271 *tests/data/fate/rgb24-mkv.matroska +58345 tests/data/fate/rgb24-mkv.matroska #tb 0: 1/10 #media_type 0: video #codec_id 0: rawvideo