From patchwork Mon Dec 5 02:36:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1676 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1409424vsa; Sun, 4 Dec 2016 18:55:31 -0800 (PST) X-Received: by 10.28.45.212 with SMTP id t203mr7395808wmt.46.1480906531659; Sun, 04 Dec 2016 18:55:31 -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 k3si11094421wme.120.2016.12.04.18.55.31; Sun, 04 Dec 2016 18:55:31 -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 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 0B449689FC0; Mon, 5 Dec 2016 04:55:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F4AD689DE5 for ; Mon, 5 Dec 2016 04:55:13 +0200 (EET) Received: by mail-qt0-f195.google.com with SMTP id n6so34174395qtd.0 for ; Sun, 04 Dec 2016 18:55:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=rebhEeFmgoawWfx4zjJfMsOE3jIGtLD2dotNhWbKuHc=; b=FEphObXDJ2sR8yxUS6OXGBjttSOxiZoi5rlfx0m2YivR8U3Lk6uqibQ+s31MuOyuR2 oxoRYL5o/LcJVUcYckwlGjoC3WscGO848S4V+Rea7HQECOor8dRWHNdX8PXoLkFT9YVi Dsfx/ajM/FPMhoMOZUQNFPCObm5uvdtea7pkeCm3KaYtZh9H2zarV5wrD5So+cyrhnPH KIrSx+wmxiyZweTgJ5awqAF5VBkR/kaTITbh0CNOOfFz7dBgTfQ5ETObxoXAyUIhwLGc 8MJOk1DObn/GcNViE0PGc4Yr3zZvv+15N9NfPOL/qpEYsw/c4GdNjR5DsAzSMh6Ytern G2Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=rebhEeFmgoawWfx4zjJfMsOE3jIGtLD2dotNhWbKuHc=; b=YpOQhvxFPTgMEdI/G3p8c7yClImRhqkvyDWGhSnn7ucciV534NVfV14Mcl3dvFHHAY +qYC09irgLWeaNFy7n9HAmwKDY68a5defTrAdxXVNEVKat/lUOeXGztJBdS+I2vbkWWg DfjqKJbQD4CdYza1RNGfenWiA0pbS4VZEjaeqavdwpK5pVnTxmacpO7gGGI6nfbesCVD pjkjsW2tYsRNunzzJVvC3ayYAIVsyzTcxle7bdz33Q3wwzPPMq3hpHt+waV7EXwv3yw5 f9MBoEPuSdPbEjTgRGYYcTaokoo+lsClqFEhal+mcmp1F6P7YNSwAZ1jByDB9VOkKxzq EsLA== X-Gm-Message-State: AKaTC00N0ATqw3J0t9fR/gR3ugWyS6/KfXz+gcrLYR5klTkgHo+3PTm737ObiOFy5BldQg== X-Received: by 10.200.46.249 with SMTP id i54mr48354920qta.13.1480905459149; Sun, 04 Dec 2016 18:37:39 -0800 (PST) Received: from localhost.localdomain ([181.22.29.233]) by smtp.gmail.com with ESMTPSA id e24sm8398043qkj.12.2016.12.04.18.37.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 04 Dec 2016 18:37:38 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Dec 2016 23:36:06 -0300 Message-Id: <20161205023606.4328-2-jamrial@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161205023606.4328-1-jamrial@gmail.com> References: <20161205023606.4328-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/matroskadec: remove the strict unofficial check for Colour elements 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" Signed-off-by: James Almer --- libavformat/matroskadec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index b53a8b1..c7b406e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2362,11 +2362,9 @@ static int matroska_parse_tracks(AVFormatContext *s) return ret; } - if (s->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) { - int ret = mkv_parse_video_color(st, track); - if (ret < 0) - return ret; - } + ret = mkv_parse_video_color(st, track); + if (ret < 0) + return ret; } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) { st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_tag = fourcc;