From patchwork Mon Apr 19 14:09:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27018 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp555808iob; Mon, 19 Apr 2021 07:11:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpKfYjtfDo+JknmPp8TlnPpXj3ytXUhfhqZnhBnweki7pMHnhwe4qALFt2VGu6OwDsHcEV X-Received: by 2002:a17:906:6d50:: with SMTP id a16mr16299768ejt.31.1618841512520; Mon, 19 Apr 2021 07:11:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841512; cv=none; d=google.com; s=arc-20160816; b=LbcfpW0K5BxTyoT3xsF07qI6/8umzOwo0PR2hhmvTv8tVkN5SwrkNJKmQevmmzgTQZ VI1u15HWTlKmtvFnpw2/hP/L6D/PX/j2MB8BUww6lm8Kpa9bRCVEhWl2IJTiSlaUMmd6 2WXiRlnM8BuK268pwRhvir/QeUanbDQj8YxLSrr70pWgJ9ZvveyLqU9PUB36tNr4fZ6j 67V9UONVRXaSvbLnu8jVNF5ctNq4qNigLICeiJ9ykYyfjlph0ohQkb2CW/YUhxnCXl91 A1ULVmBKInumeXjeA4UCHVdOTFZuiHcXRx8XzDdmpCDPPxVoOpU7AAjZoZTPp2r0H3xn fZTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=4NG9DGOMdvJqLZncDP2XAk6RsENKHRzKHJAJ2Bor6ts=; b=qSmIhHvGdZ5VgUZn7vvD7F9lUhpL/sGaz/J0gK3T1AyCWIYYz4jHtx46hJCyJkhb4+ IPW4Clzg7kwkxRGlKZ60UfqxJOkFRQLjvBAnMx2zsN9mLI+rW0XhhEC5LQYEfdPtRPmr Y+W7ZUh+RYVuNGuU2FOqeqcwWvngD+DpYcf+l4WwzCSFIj/hgwMTMWllVm9xwHOLr2Z8 rdT2xjfjO1MRTOUVpL0TQgb/wjPMF2M6tbFU02kJvB9uNKF2InfzNv9IE0IjQ46Q0vML sz5glAIHt9SgAZi014MZ4KoCqPLbaN+eKqKTaPrjuHCLVKc1l/+71JPmFFJdhC4WtaXW q1Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=BFrceeRK; 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=QUARANTINE 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 h12si10852222ejc.210.2021.04.19.07.11.51; Mon, 19 Apr 2021 07:11:52 -0700 (PDT) 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=BFrceeRK; 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=QUARANTINE 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 14726680967; Mon, 19 Apr 2021 17:11:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA345680742 for ; Mon, 19 Apr 2021 17:11:21 +0300 (EEST) Received: by mail-qk1-f169.google.com with SMTP id d19so132946qkk.12 for ; Mon, 19 Apr 2021 07:11:21 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=TFyYbx6lDJ2YroaCm4ixzzMRRWWmgmiGadOHf5JY+OQ=; b=BFrceeRKou4sjldT+dhJhPpnVPhuhNADbQq9R41NP0Ma5khpRsBxg80d5/b8DSIkfF PshBlmYIciYTBvJ/xe+YlEsoOcuvnfoxpg08VZIEfV2KYMlskizjPI1ZZT+fM0nqMyep 78p6iW8UHZr/HAn6OZJ6ja63RxSUvXLPnVEI3eet2w4qKmB8ofjpNqqhVf8Iw95pLIuA g29iNx6Qr2nx/zHjnG9k0FdVQW/QFvPaotSw+5PTq+mSnf2k3wRmtYv+hx8zu+kmydd/ +zlUDSAqUSk/At4slWH8TnWNxThFNEIM27gYG6yukiNqTfGB957zRaegoFeR8WXUoeHG khuQ== 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:mime-version:content-transfer-encoding; bh=TFyYbx6lDJ2YroaCm4ixzzMRRWWmgmiGadOHf5JY+OQ=; b=D775plvX1YgJlKcW2qaR1WEG/QZx4Gjn9buMexBpWRsYqat2W+Lvvs+ZbFJNiomUmE 730ZuavhyQOQf63oJpZy7GSKyAkkpb++ioX+kKlJZPNpdQyBbztPah1borUgLHJoSfAs w0Uvh8oFISi13AuBzlP0Ff0OhUI12fjG7aUbjUuk6WLsiYdynbZeMCqOO6Jd+StQvh6e Vj7lc4cwQX6/t1nEPqF67iFvWkSCBBEsN84cAbXAOuu/UMEN8cBoruroZXIM3Iv7KV9X f8SaxEJeDmX46ZguGE/A20YvMX0Z9e7Cz+1/tYmgpnOgTnz9OevO/NKnPMXP8tJmnl7N 43Ug== X-Gm-Message-State: AOAM532ZW3k/ElUCYGUZs/G7xEoVq0Jm4nnt7/REcqVogOYF2gSbKlZj 7stVLfnNsddqOJfOKj+RjUdUNbPxuO0= X-Received: by 2002:a37:492:: with SMTP id 140mr4232288qke.161.1618841480488; Mon, 19 Apr 2021 07:11:20 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:20 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:12 -0300 Message-Id: <20210419141024.8174-16-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/87] avcodec: Remove deprecated avcodec_get_chroma_sub_sample X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DBD2F0WzxyHG From: Andreas Rheinhardt Effectively deprecated in 2c800eb7375c65ffd56164b03bb035bdb3f1e172. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 9 --------- libavcodec/imgconvert.c | 11 ----------- libavcodec/version.h | 3 --- 3 files changed, 23 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ff684d17e1..69f69a1aa4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3574,15 +3574,6 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, * @{ */ -#if FF_API_GETCHROMA -/** - * @deprecated Use av_pix_fmt_get_chroma_sub_sample - */ - -attribute_deprecated -void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift); -#endif - /** * Return a value representing the fourCC code associated to the * pixel format pix_fmt, or 0 if no associated fourCC code can be diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 8de1563404..a3443d1c72 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -27,23 +27,12 @@ #include "avcodec.h" #include "internal.h" #include "mathops.h" -#include "libavutil/avassert.h" #include "libavutil/colorspace.h" #include "libavutil/common.h" #include "libavutil/pixdesc.h" #include "libavutil/internal.h" #include "libavutil/imgutils.h" -#if FF_API_GETCHROMA -void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift) -{ - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); - av_assert0(desc); - *h_shift = desc->log2_chroma_w; - *v_shift = desc->log2_chroma_h; -} -#endif - #if FF_API_AVCODEC_PIX_FMT int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt, diff --git a/libavcodec/version.h b/libavcodec/version.h index 590a8d6f4e..0e9c92a9f2 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -81,9 +81,6 @@ #ifndef FF_API_STRUCT_VAAPI_CONTEXT #define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_GETCHROMA -#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_UNSANITIZED_BITRATES #define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59) #endif