From patchwork Sat Nov 18 01:50:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Zern X-Patchwork-Id: 6158 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1329046jah; Fri, 17 Nov 2017 17:50:20 -0800 (PST) X-Google-Smtp-Source: AGs4zMa6Xc2q6QveTh0gVs9kvfoZD7mTuOn+e/KmuMenxl7JGS6PDJh3JIfyuC55AnASw0VUsvI1 X-Received: by 10.28.191.3 with SMTP id p3mr4868343wmf.81.1510969820729; Fri, 17 Nov 2017 17:50:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510969820; cv=none; d=google.com; s=arc-20160816; b=0YMRaLfgSekyh2fDOqZqo17Pu3uzlGGNkuKzXS9Zycp320WhZFA74rnWZvW71ZqZrz gORUZTvGggqxgSZ2XSlaI5oraTyBIOPK8oHzVFCVAzfVvRTrsuIcc1ELATWOk5ZQpPCN TYx1ykWKZFQOMQ7Q/fLOMpML07lyLjvkeWJHOeki0c9I1ondiIKHu1njbOaKNAuzAQ30 7udvJGZFNIIHBUM2o0uNJBe+r3aKcpMumjHSCL/rrCwsbC+rM8/v7dswzHo2RqOlkwVj i2PDUvqrbsitrdDIykUmwusnwyND4rHjRFvMIm7ii3nDrmqtb8cw/lBlqpT2jpkHkVfR yOUA== 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=eo2jupPZStX0p6wd03tjI/njmadjOpQ0FZhcZfTA2Pc=; b=VWP5qwgrJgQqzez05g5sUGlay1FUa4e6pISWXon7mgROasMCZq1FI4HQalwJ/OxALi +B1yzfLGGnR40n2Aq1vgVarz/PONuIx3ZHzARa0jMN8U239Ok1RnTYdyTKBYxgmhvssK wNi1yFqxwXa/s61tOOz9OmGZaAMYaAYV2BJDOlIYUwgbnAzGBmVnQQMrJhOOcRa3e+Wh ZtLNaEVJszB0YNwV+dOcCkxi0FAYTGswljxqKnfLXJNOiwftW3loEgs6JbzNwsVJ2gRh PAhv19gQA5mAjw+i7LcyIDVNYSNPFHYXZKGv33UB6+S6o8iznkVypcJyA2eE8eSH4iz1 Vu/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=Be9y6V6A; 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 f67si3707821wmh.108.2017.11.17.17.50.20; Fri, 17 Nov 2017 17:50:20 -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=@google.com header.s=20161025 header.b=Be9y6V6A; 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 6DA83689DB2; Sat, 18 Nov 2017 03:50:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59F92689AC9 for ; Sat, 18 Nov 2017 03:49:56 +0200 (EET) Received: by mail-pg0-f65.google.com with SMTP id p9so3210577pgc.8 for ; Fri, 17 Nov 2017 17:50:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=NipND/xkH/9cuckj5QXrVxpMG4vG8T/LSHgefCk40Pk=; b=Be9y6V6A765MLVHXezpWZYl7E2FSZS5nvBPSDqZcxDPixlUGnzbpRFFD17s8agaLvj 2SftSGo0kUOOUFzm4lXiu0tFsbqcSb0rq7FR4OUxJutNvS4/Urp+CE8SNE/OtgD2UhbN 8N/Y1+jHyKgm5kyL69eXvGBIDCOtBYPybByWXowEVFlHSsomGxRZOs7b/zrYowKVHub6 Gvlepm1ZNWpHBnMCHOCIAsX68R/nZE+uI+IvsW+G6eMSxScu1E/HKT9CdYyVTcZl4ZmA lyN0NsIyBMXUulfXiFrZiibrtftISQWleDwldBlIK63E6Z8epoPaqdhi05dBwQnvzhrn ESCQ== 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=NipND/xkH/9cuckj5QXrVxpMG4vG8T/LSHgefCk40Pk=; b=Sap6eLCn0cocCJu92BqW+rDm6t4deO2zPDgKkoxFETC5KRCjdVrKxq7dV4DkYX0/MH jV1YC7ipL8m13Cs4Vy+k5sX0+1kVILLOWlY8oEmuntK+Wq9LKYfEO/7qcX4kK7C8u7TB OgRG49ymVOXwS9gykUb6q+aDrtT09JkE3cTRcUINHy4NhHsSHkam1NGL/pHxEx9Zhdpk g0AhlWMalcdLBV16D/HI+DEiZTIdwCLjwHWVP1F4z9RjDAYQcDMkj3LDXQ3iPXwMcd4p pNa6uaFY7ix76ROEXfcffaH4X0x6TXigiCdyVFCKpBg18UTG9Vqaxw9BwoFWuSZl3sty ldxw== X-Gm-Message-State: AJaThX7XnqBA/cgTtFMPEwqcomQnHm/O9UzmK04VgNd931BAkGQIIsPq tuebR2ViiPhQ14ohyUIWtqodqXtj6U4= X-Received: by 10.159.216.152 with SMTP id s24mr1219111plp.447.1510969810087; Fri, 17 Nov 2017 17:50:10 -0800 (PST) Received: from jzern.mtv.corp.google.com ([172.18.84.226]) by smtp.gmail.com with ESMTPSA id o84sm9901828pfa.46.2017.11.17.17.50.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Nov 2017 17:50:09 -0800 (PST) Received: by jzern.mtv.corp.google.com (Postfix, from userid 105886) id 9728488BCE; Fri, 17 Nov 2017 17:50:08 -0800 (PST) From: James Zern To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Nov 2017 17:50:06 -0800 Message-Id: <20171118015008.123256-2-jzern@google.com> X-Mailer: git-send-email 2.15.0.448.gf294e3d99a-goog In-Reply-To: <20171118015008.123256-1-jzern@google.com> References: <20171118015008.123256-1-jzern@google.com> Subject: [FFmpeg-devel] [PATCH 2/4] libvpx: remove pre-1.4.0 checks 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 Zern --- libavcodec/libvpx.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libavcodec/libvpx.c b/libavcodec/libvpx.c index 1eca97a081..36f915a8e5 100644 --- a/libavcodec/libvpx.c +++ b/libavcodec/libvpx.c @@ -40,9 +40,7 @@ static const enum AVPixelFormat vp9_pix_fmts_highcol[] = { AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P, -#if VPX_IMAGE_ABI_VERSION >= 3 AV_PIX_FMT_GBRP, -#endif AV_PIX_FMT_NONE }; @@ -60,30 +58,22 @@ static const enum AVPixelFormat vp9_pix_fmts_highbd[] = { AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV440P12, AV_PIX_FMT_YUV444P12, -#if VPX_IMAGE_ABI_VERSION >= 3 AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, -#endif AV_PIX_FMT_NONE }; #endif av_cold void ff_vp9_init_static(AVCodec *codec) { - if ( vpx_codec_version_major() < 1 - || (vpx_codec_version_major() == 1 && vpx_codec_version_minor() < 3)) - codec->capabilities |= AV_CODEC_CAP_EXPERIMENTAL; codec->pix_fmts = vp9_pix_fmts_def; #if CONFIG_LIBVPX_VP9_ENCODER - if ( vpx_codec_version_major() > 1 - || (vpx_codec_version_major() == 1 && vpx_codec_version_minor() >= 4)) { -#ifdef VPX_CODEC_CAP_HIGHBITDEPTH + { vpx_codec_caps_t codec_caps = vpx_codec_get_caps(vpx_codec_vp9_cx()); if (codec_caps & VPX_CODEC_CAP_HIGHBITDEPTH) codec->pix_fmts = vp9_pix_fmts_highbd; else -#endif codec->pix_fmts = vp9_pix_fmts_highcol; } #endif