From patchwork Sun Jan 15 13:59:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 2218 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp962380vsb; Sun, 15 Jan 2017 06:06:29 -0800 (PST) X-Received: by 10.223.168.87 with SMTP id l81mr19155906wrc.194.1484489189558; Sun, 15 Jan 2017 06:06:29 -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 j9si18230072wrc.127.2017.01.15.06.06.28; Sun, 15 Jan 2017 06:06:29 -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 8FEDF68A38C; Sun, 15 Jan 2017 16:06:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 283D968A36F for ; Sun, 15 Jan 2017 16:06:10 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id d140so7775591wmd.2 for ; Sun, 15 Jan 2017 06:06:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=HoyHC3R8P/01sUz3TzJsHpTBB+n4zIkN0MbmBFfN/JY=; b=BfiTHaFRAGvR1F4JvAfgewdVqhZpGYjGmcV28K1Oh0XLIjkYwl1d6afEg3G+R0mrvF lhS07JTvdvJFZNjoxKG4wAoDRHdqL8YGR3o/Bn3tB2R8JfgwDDVBihyb3xvDCWh1rtTL uhyj2QfRsA80M1+MEdUI/eqYwl+YNxtpwmdD2bIdbDFMssXSDtYEA855TK2M6aLtDzMY VfuP0e3ga7a9CzrTICg0adKyBfzz7tn69CEyndIIKAc8AncGAZzwOkGaCCjbKpfLsOpQ Tjx1ufmGZpLMrxPA5MSCiSqLau/m4D7aSV8v2h/fbHulpDeqPvq7mfG2oS79HKzVAga0 PX9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=HoyHC3R8P/01sUz3TzJsHpTBB+n4zIkN0MbmBFfN/JY=; b=kJmOeJHd09ndKJvW2HTjrK3bN0z0AMb0RyTbSbnPgYuGrlyWmVfyvN5/OA9+SEGVvH Gu+2ZlaNUUmNw71ueRaERT8xVZTE6lRZ6mLMni0F8p6Nd3UxE98yksBkW/m2HGe3sRAl Fvsaf40AgoiFb5blJ/vml9tx5d9c8adJ9FPBcGUHZyUBT6M8PQv2i2ZTpJL8lbgIzcBa je9oHf+ecx8q8ibjlZLDEwm4WnShRZFxkJOgqZ4lIEQgfm3IKEl+unS0kGZZMsTBbhcP gDrfljg+IVezUrd3M4HLQxEE/Rlp1Ng5M69+8GdpjlCFfiwcRIyCQV0xdhBAVBeQsWG9 0BfQ== X-Gm-Message-State: AIkVDXJet1jsJZ/3ejB+bJsBu5MsqipG0tx9Iej39JIT5pvIItqMrXt1K3CJR5VkkMo5Ow== X-Received: by 10.223.177.195 with SMTP id r3mr23021312wra.122.1484488801902; Sun, 15 Jan 2017 06:00:01 -0800 (PST) Received: from moonbase.lan (host86-146-194-179.range86-146.btcentralplus.com. [86.146.194.179]) by smtp.gmail.com with ESMTPSA id c81sm20999425wmf.22.2017.01.15.05.59.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Jan 2017 06:00:00 -0800 (PST) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Jan 2017 13:59:53 +0000 Message-Id: <20170115135953.36844-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c Subject: [FFmpeg-devel] [PATCH] matroskaenc: remove unofficial compliance on color information 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 Cc: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" When support for this was added the details weren't yet finalized. This is no longer the case. Fixes writing of mkv/webm files with HDR. Reported-by: Kagami Hiiragi Signed-off-by: Rostislav Pehlivanov --- libavformat/matroskaenc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 4e4afc17db..f731b678b9 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1248,11 +1248,9 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, uint32_t color_space = av_le2ne32(par->codec_tag); put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLORSPACE, &color_space, sizeof(color_space)); } - if (s->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) { - ret = mkv_write_video_color(pb, par, st); - if (ret < 0) - return ret; - } + ret = mkv_write_video_color(pb, par, st); + if (ret < 0) + return ret; end_ebml_master(pb, subinfo); break;