From patchwork Mon Nov 27 08:36:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Robertson X-Patchwork-Id: 6403 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1418819jah; Mon, 27 Nov 2017 00:42:34 -0800 (PST) X-Google-Smtp-Source: AGs4zMa+mNRdEswZpFuO/xQCnGENqao7+L0cuNlQNJoPEOaxS30vuVDcfW2DyHt/OsM5HRq2uHI0 X-Received: by 10.223.129.135 with SMTP id 7mr33849210wra.55.1511772154598; Mon, 27 Nov 2017 00:42:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511772154; cv=none; d=google.com; s=arc-20160816; b=oDFwc8IDPRdFR9MaMWn1fzC/L4FAKgb8bPRJkh2e5U0ddz7vHqe+6n/9PWEnbpxHER 24gWF9EBn2MU923fddWXT8Gv8lkYo/7aV9zt+PCtkpGmlcMDcbnlyrwJ6uAVqtw5MWqg CcJhxTwnFm1qcUp67XTSS5tDwdbTe2bg8H8CsrSkH5LnJm+B2nFebwWVW7qEX+jAn0Hp fjFUCVhuZUdkdStA0mltHFo3fhu9+MgMLLTGsn8y2rOHaIe4Os6uo6thiJlpCfn0K3kk vRPDqwfNWsfvBPHJ/Cr+UtAQ3QRexDFTIpzrIWvU5Yuvb3FX0WiedY+Zpyc63ahZjWWo JW6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=G8CNJNoHn/8TOinckrBFEdDDJoqCN/nF5bsfOsfB860=; b=eJpuoD8dVgJc+R1BhYn2HIgdlJtjQooIXNpMiJpYiP/d/SQC3nxsfp+UAkY6V5T8aP UzxfUXawoQKldElbKxzdm50Kec4Lsog8ttgtV1DG10BP5TrQyY4KJILcyFAydxuq3qPh VftFsLsEtYfmhxjou94AJgWC/8Ps7Gp71nD51z27V+TOV26PHXXpL+SW/b3yKsbJNNGW 4sDS28tJv71MUVnWLk9v84+KEzX2q5+8lZTpLPnCFs3NalMwDlsJVLeCwnTBEACZ8Knm 2y/BPIveYUxru9mq0XrlqhsrjSA3LWND5M8uRi4LBqwvP0D1WSPrX/N0a00ciOlDNGu0 oyXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@strobe-cc.20150623.gappssmtp.com header.s=20150623 header.b=sDSVCpF/; 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 187si13126411wmn.2.2017.11.27.00.42.33; Mon, 27 Nov 2017 00:42:34 -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=@strobe-cc.20150623.gappssmtp.com header.s=20150623 header.b=sDSVCpF/; 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 C7CDA689E11; Mon, 27 Nov 2017 10:42:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f193.google.com (mail-io0-f193.google.com [209.85.223.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9C2C689CCD for ; Mon, 27 Nov 2017 10:42:23 +0200 (EET) Received: by mail-io0-f193.google.com with SMTP id i38so35454315iod.2 for ; Mon, 27 Nov 2017 00:42:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=strobe-cc.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=cGIIiqd2YHVOVj5N1Tz3MLSRiu6DJ2IBsqxLrtsQaxA=; b=sDSVCpF/rK9czhEslbxfjhp24i5j7hgwJ21ErBP1CuXYfUYaZSEVTIe96uwU/DzCRt 6ALB6v2HWKy27a/sFcQCi2kCWA/TR/RiDSJ3niWWDg/AGzjg1xvQ2IxpLBk+2+n7MQW8 sn6ZO4h00u0MPO0ynbuBAi+gkRgIF1qAVCcQE931C/EpIr8QbD4yySFdXhv4MFaG3JI3 FjCLZBEhk3F+oSVs8HLRdYepSTDcKHcr5dTGUsnf1ec5YMWjlSW/GMtRLIcjji67O3C1 IYAfHpOZDgQxtg3+3qGq7b0RUDmNzfjjQGHbECDmv2kvX7TjhAPadkb/MWPLadqTUuG6 4Z9g== 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=cGIIiqd2YHVOVj5N1Tz3MLSRiu6DJ2IBsqxLrtsQaxA=; b=HYce7n31o9NqSs8J4HDE1hm7euIYWYmDJ0Z76XUEJ83SfPds9qafbrNCXAO17pWqqe 7WdTgSPLsXF5Or6kDTIghX8eDNxa2Q9UEbic/iwhufmr//ucSbDMOjAkfplmMtcBdXWz u9EuXA2udM0LPY1y6rUOinfkLJBAIOtrAaushUJ6Eet0zFFOekTqCAQ3S/KDHYOVdP94 BfwHZZcAF2PkV4eB8RdFjlhZ8iXTw63LQqhZNEo2T4XqI6CWdByLCye0X2n+prq24JCv JBb3cExrEcT++ClEDn9arb+P3eXMNsxjUW4dynMIU2hbnz8XaIwW5x/PlP/+jXPGqbss IWhw== X-Gm-Message-State: AJaThX52Paxs4rtvhBvQzd5tWs2jMB86d2mxmF+IbCkRPm2rUq/cz1IB DbrlAm8ulVOaaE0b5CD8XZjTGuE0FiU= X-Received: by 10.107.22.71 with SMTP id 68mr34225270iow.150.1511771830351; Mon, 27 Nov 2017 00:37:10 -0800 (PST) Received: from donner.sbo.corp.google.com ([2620:0:1006:1:b5fa:2fa0:9a43:a02f]) by smtp.gmail.com with ESMTPSA id d24sm2870806ioc.68.2017.11.27.00.37.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Nov 2017 00:37:08 -0800 (PST) From: Steven Robertson To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Nov 2017 00:36:48 -0800 Message-Id: <20171127083648.10588-1-steven@strobe.cc> X-Mailer: git-send-email 2.15.0.417.g466bffb3ac-goog Subject: [FFmpeg-devel] [PATCH] [dnxhddec] Do not overwrite colorspace if the container has set it. 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: Steven Robertson MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Robertson --- libavcodec/dnxhddec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index f46e41a456..6f8c716412 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -93,7 +93,9 @@ static av_cold int dnxhd_decode_init(AVCodecContext *avctx) ctx->avctx = avctx; ctx->cid = -1; - avctx->colorspace = AVCOL_SPC_BT709; + if (avctx->colorspace == AVCOL_SPC_UNSPECIFIED) { + avctx->colorspace = AVCOL_SPC_BT709; + } avctx->coded_width = FFALIGN(avctx->width, 16); avctx->coded_height = FFALIGN(avctx->height, 16);