From patchwork Thu Jan 12 14:01:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 2197 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1292350vsb; Thu, 12 Jan 2017 06:08:11 -0800 (PST) X-Received: by 10.223.153.144 with SMTP id y16mr53524wrb.81.1484230091023; Thu, 12 Jan 2017 06:08:11 -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 k3si7399586wrk.55.2017.01.12.06.08.10; Thu, 12 Jan 2017 06:08:10 -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; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE 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 1850F68A2DB; Thu, 12 Jan 2017 16:08:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f176.google.com (mail-qt0-f176.google.com [209.85.216.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F94B689AD7 for ; Thu, 12 Jan 2017 16:07:55 +0200 (EET) Received: by mail-qt0-f176.google.com with SMTP id l7so18633896qtd.1 for ; Thu, 12 Jan 2017 06:08:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=+NeYViYN1q5Li2ylyE9P1qdnZvsNUUHJuPeZe3XnXqQ=; b=i/blLriBdA6ZAkZgpdP5c72Vcc9AZjmkLmBe4TlCsASjrLuulwTzuVjplgrb7sYn+m ZeMGDDDFatcWgOvQFyCuDJ55nECc85aePlSdlACY/eCBwqba8XZrJIGL3+syqLeCkv9e TBpypSLYGykemZNd8HT5ifDpqFcQf1JacRbxfQQK5gPuaqOEGP1N+bBoSjGT/VPJR157 6C2Z8NGHJM4lgc7sj7+yyhomlq9JL7EY05kwqVMGfNgJ9e2XGkcHFC+XoMe8khZ+apeg LYy6msGin+fquOSH60UT5mXYGyK/BgIa5Xw/uevTUWV3ZxzV/31QKrrikbvitL7wckqm w/7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=+NeYViYN1q5Li2ylyE9P1qdnZvsNUUHJuPeZe3XnXqQ=; b=IuA8WR31VWVPLOqIKz4k+dkHWtf4LV7b/+ZHGL+dIiKVXy6HcT6dBuipGKd8gX0n0k IB6CzclRnMlHUezJidqkRfn+Va8xFQ/3LoXbl3k4NbmBaJ/xl4iCDgojDpDs/eu4VnQd 2mwxXqB4Re+Qt2Rg+dFqlCihNlKYb5Qg43QZ0DML79/KLhmeGW7jt+jippnnqG9iQm2A isgoGhJF31qCjf4KxBDskVT65pBG0gfABYog84AGT2Sj+3Tl6O3LrMM9PqA58vlKg11V +BG3DXGvwQg2cGpIKEOWgaI+1diK215A+lUCqD0w+1IDaVRu/+8hyfZru8ggAu3UskwI PL/w== X-Gm-Message-State: AIkVDXKUbE7Dcpm1QnA39dEvZCn/f9EPe1D9VIWDr7iDIs8scdDZCTXCKDUTScxG28ocbvSIJqM+HC1WlRthmg== X-Received: by 10.237.46.103 with SMTP id j94mr12289126qtd.103.1484229683488; Thu, 12 Jan 2017 06:01:23 -0800 (PST) MIME-Version: 1.0 Received: by 10.12.175.142 with HTTP; Thu, 12 Jan 2017 06:01:03 -0800 (PST) In-Reply-To: <20170111185516.GS4749@nb4> References: <201701101723.04186.cehoyos@ag.or.at> <20170111185516.GS4749@nb4> From: Carl Eugen Hoyos Date: Thu, 12 Jan 2017 15:01:03 +0100 Message-ID: To: FFmpeg development discussions and patches 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" 2017-01-11 19:55 GMT+01:00 Michael Niedermayer : > 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 New patch attached. Thank you, Carl Eugen From 61fc1a71c0af73657b5260ea4e7a29d43e94c937 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 12 Jan 2017 14:50:52 +0100 Subject: [PATCH] lavf/matroskaenc: Do not write two CodecID elements for rawvideo. Fixes ticket #6068. --- libavformat/matroskaenc.c | 1 + tests/ref/fate/rgb24-mkv | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 78a621e..7e97586 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1119,6 +1119,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } else { // look for a codec ID string specific to mkv to use, // if none are found, use AVI codes + if (par->codec_id != AV_CODEC_ID_RAWVIDEO || par->codec_tag) for (j = 0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++) { if (ff_mkv_codec_tags[j].id == par->codec_id) { put_ebml_string(pb, MATROSKA_ID_CODECID, ff_mkv_codec_tags[j].str); diff --git a/tests/ref/fate/rgb24-mkv b/tests/ref/fate/rgb24-mkv index 88d22c1..4c357ac 100644 --- a/tests/ref/fate/rgb24-mkv +++ b/tests/ref/fate/rgb24-mkv @@ -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 -- 1.7.10.4