From patchwork Mon Dec 25 22:52:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 6965 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp6193619jad; Mon, 25 Dec 2017 14:53:41 -0800 (PST) X-Google-Smtp-Source: ACJfBouxCc5irTkRl6kMJ8XlI/lS6JR1/vaRIVViVk0s20/Rl0LekWJrhz1hVwJf+70AQc+Z8n2A X-Received: by 10.223.196.18 with SMTP id v18mr4644274wrf.72.1514242421794; Mon, 25 Dec 2017 14:53:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514242421; cv=none; d=google.com; s=arc-20160816; b=PlOHAZjXg3j74BpPyk2gllzq7NpgsqZD4dnCeOgJHaW270c2ufK8uX4D4lGDlpyRJi x+dQ+JPqg/f6U75ILdCWxaC6dZ5r8akvlBMzSXZcRoW3b/Ch2SMkCLh9mP674RH3UxIO 7yA5RxZ8x61RE6rEzOe2sWkVAq7V22Q+YBEidJ1s68je/HCTe2FlgssctysyofYtoZJZ CDvOp+IwTa/EVYHW3wvo/h8zisFUTOR33K+9RHTGwVk6P7SFNK2Z9a32wpH6H8HZjOYW 4Mt6qMh5Ox15M+dqY7QfYY3blsvODV8oOk7474Jep0zszzVxlfMBR7Vyuw3kYHxSXy3Q /JRg== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=6zQsqHRkdBbLRB1tll5p8JPRipdRUHHMQf/vJAJ4r80=; b=BVxttlKohKg3WRNv3xhY4/XlJdgh9sT2lt5IN9ylabt6Pz0bR+FyLEcf8vObfLOe2I Ft/nu/02VWqIQtEaTtUHcKV1skBTOhAqeQbGyvBwPCUh9oSrUJyAaeD6yiGoqshwxQhS 6aet/ilJwU6qfZm6ZtIuyO4+h8yuPPKE3ZRUtKUwcNCcx8frti9LejFpNzMQanr4oY5x ct2jo+K7vWL5D1dUTr2LRuni5VVNHd+Vs6nydLuIBTL9KGdLRZU4fyK7hTX9Q584CSjr oYHFREiTSBhiyEIiRdkuV9xQvTKabBl4ZBpA5/Fr9ToiuSFfpOiXcW2TxAcoEG/d1vVZ kRXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RsOV3tZp; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w83si10871726wma.41.2017.12.25.14.53.40; Mon, 25 Dec 2017 14:53:41 -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 header.s=20161025 header.b=RsOV3tZp; 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 91CF5680623; Tue, 26 Dec 2017 00:53:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA14E680498 for ; Tue, 26 Dec 2017 00:53:19 +0200 (EET) Received: by mail-qk0-f194.google.com with SMTP id j137so24280429qke.10 for ; Mon, 25 Dec 2017 14:53:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=EqtEE4u+TyfkeQYtxZnv3ejsWI2gQCEjStxd/3Mp7CE=; b=RsOV3tZpVC4rkSw64jHHagDbIHX7C4ZQGO+guWYZg/UEzTCMFaGf0LkhwTjEy3uT/a uiFnKjenWo0E1I8doe55iwYmC/KCkCqr+salJiezSL+bRetqvQUK8B/9x6Fd3+QrXWg/ 1Cybjf1IgbapMfTjTnGSgQIhKYTg04fqkbR/zMMwuY5W63jNo/jqJnUmIjfIGK8gTzf4 XXvzXKlPZKR5fNht955TCWWSVNQY4a1FlBXPil0jhgxeb1Xc9VTE6oIzOcQPm+GMb6zU lpCM5h4m9l0L0YzkyIGf4jXECxDy3Q1Njnn6MxzFgiyV6X3HmhKHZuiM9Z0zAk87hYky QEhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=EqtEE4u+TyfkeQYtxZnv3ejsWI2gQCEjStxd/3Mp7CE=; b=ai/3JXyDGo63dzp2nnaNMb6xXsw7d+tuC9/YN8sm0q/S3tFw0tQEG0QzYZjV8HXkF4 jixMsMrR7jLApLXeuuCxds5UkeKm1UtG3rnWeDxOhEPoqPsNRYCNOreAVtfu/Ij2GC4r 5YlxRGIRtMMwRRlYyMm09SItYKuBF7/RNxxrdMQ6J+AOqv374SsIiS6cBXbwGNoysFi1 7Ti3fx+Ry9iO9IO/k0kKOIGRhKrBHq6fVpo+zS+81FqFH4BQcly34tMbTfi6EaPyxzgm afdM1/nnXB8CD/csToF//Yua6LFzQ9k7rEh3PJiJbdUGSUgxao56HYe1TXNomnf0MXqs s+Bw== X-Gm-Message-State: AKGB3mJy4ebz9t6a1vhmL+GAK4b+SXD/8ubF45G5IBX5oYUzA31AFcTO Nof5B18J/wPCjoTwZ+/CM9K52g== X-Received: by 10.55.3.17 with SMTP id 17mr6202754qkd.207.1514242411657; Mon, 25 Dec 2017 14:53:31 -0800 (PST) Received: from localhost.localdomain ([181.229.225.176]) by smtp.gmail.com with ESMTPSA id j4sm18694154qtk.15.2017.12.25.14.53.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Dec 2017 14:53:31 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Dec 2017 19:52:56 -0300 Message-Id: <20171225225257.10044-1-jamrial@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/libx264: use the pixfmt descriptor to check for high bit depths 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" The x264_bit_depth constant has been removed in newer x264 builds. Signed-off-by: James Almer --- libavcodec/libx264.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index e2455e18de..2d36c5e566 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -272,6 +272,7 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, int *got_packet) { X264Context *x4 = ctx->priv_data; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(ctx->pix_fmt); x264_nal_t *nal; int nnal, i, ret; x264_picture_t pic_out = {0}; @@ -279,7 +280,7 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, x264_picture_init( &x4->pic ); x4->pic.img.i_csp = x4->params.i_csp; - if (x264_bit_depth > 8) + if (desc->comp[0].depth > 8) x4->pic.img.i_csp |= X264_CSP_HIGH_DEPTH; x4->pic.img.i_plane = avfmt2_num_planes(ctx->pix_fmt);