From patchwork Mon Apr 19 14:09:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27020 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp555663iob; Mon, 19 Apr 2021 07:11:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0y7PQhqgWUytbTkWjibxWBkTob9lXsnLsvpSC96YZoOaYtiy06ORrgKnk55XVCPfl8fSA X-Received: by 2002:adf:ffc3:: with SMTP id x3mr14962117wrs.263.1618841501659; Mon, 19 Apr 2021 07:11:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841501; cv=none; d=google.com; s=arc-20160816; b=Oyq94Y58gQqZekAlZh+csQaJe5V6hcaamAZQhXi5WUtBPZPKjd/7UceQs/x+JoOGO0 hCGBsHSkuKATVaqqhX+zAWjy8kgNqyGAbVJh05/g/24lbdC/R6FWWiJrgeLBCXNj/RDb g7FU1QALA12+VrsCaaVzgCCe3CD5WTkE/x5WUq5W53bbbQk8awS8vedCw0t9Li9L/7BQ wWya1HjZOblBLWTO1AD+9H0GJ5Kh/HG+DXHVR8rV8+4fnrRH1eksTbzpeXvAe+g4OCNY uYSROXBVjRd/12xD8Z1GTJ+evSw0d1MJ3+ZEARIb0CuJzNbkfbwIg5K92hjo4Z82YhTm Qg6Q== 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=PYAepqVW4qVYpeXs+qvnmkGVPnfzO21DE5Efm6Lz9SI=; b=iCLp5KYNSBgAfdD6gMfhVUqAjTCMbx+J684qCz7CGtq2wqTt1RiYO3fDlbJoSwuRHc otjw8KQWLa5/fCTZ/I/g5YoFSwMfI6J+skAXsdArFbhgHGVejQLJG5t0v8CPn5pqJGRe YfCSxKWXFTpqKo8WS1Owz4v4GeFEP5W6BJug3scXo6NP3YqzduxkyCJ8Gca1XcFJEwp9 qnioxLVZuNg07iFx/T08MxJIpOBlS8nHmQyIoJ8vNp5K0t4vWebYEpPmKKw5KeVVUl0r WgpSYFApd+P7BdjAb0bLs33lr44i6/kzVoYsDXkIPKWGKv/xZ/Z2w8II+jj6CThKXbc7 +j3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EO1kVEdg; 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 p25si12624840ejc.571.2021.04.19.07.11.41; Mon, 19 Apr 2021 07:11:41 -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=EO1kVEdg; 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 070116806F8; Mon, 19 Apr 2021 17:11:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B70B8680271 for ; Mon, 19 Apr 2021 17:11:20 +0300 (EEST) Received: by mail-qk1-f176.google.com with SMTP id d19so132884qkk.12 for ; Mon, 19 Apr 2021 07:11:20 -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=UJUQ1FatloYwJNPBlOR0eMlZlyttJwi4w5DlFzg9g4M=; b=EO1kVEdgzyZW+C1Gtt6TrKqt/HJejfSEpQUCeXffc7q7c1d9+pkRER13p2nLHAtOnb r1NzUqyV6AqXbFzsEDBFbXtXDJA3HgujG0dQut4UposhMkSqmj/2UoUPYDAMtZyb72fX 8pCkRzFOVLjp9croZdKj78Obf5RsxMLRT6qJ07XaFs9O2kPk8NwHS88YsPOkE9lygW9Y 4EUOB5GKZdCX0rxeLCkPCd1L0VaP0WjXOYoUu60DYWHvGIdwfAxueYB0vXhID7r5Adsi Dcr0CSS6Y2HSVXSn5Oh2klN1470BnJO1ogDinYAmUtr5QMKR1AOStLoFcH96lLpscEu9 EvIA== 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=UJUQ1FatloYwJNPBlOR0eMlZlyttJwi4w5DlFzg9g4M=; b=t5cJdLVb82cENv4KiWoLRDyiZ7X5Q/J8mQz0oDGj6AI4zLkWYlowBbQnoqTLs2uLGE 5Zm3wu2avk0ZDzMSUwOGluj9haLR+MqKr2NrSphIBn5GCMLT4y3J2OpP733VNl1mctC8 EU+O5TdNvaR+LDHl4rZ9ZMRlF+pO4YsizV/3AZLRpK2ikdYu1IpnDl6te/J9/OQmvetc tKXGuPeyP6VQRZ2vw28JTCX2VbEReXUvBTtx1nICRaIUa09Zdgezckt/SlExKaevkSz6 4isDPjXVAa6O9cTHzAjtDw1KbM+l0nGBDPPu3TwrgKqrr4KQNIxgYptIHdCHEya9EjRM 924Q== X-Gm-Message-State: AOAM532UQ+DHOcVtRsdlf2KYxQWd3wgLJaMhv2SfQpYFHP8+n6LJW7g3 O4P3an2KreoC0HAlNybCTPg77a1jjnY= X-Received: by 2002:a05:620a:1522:: with SMTP id n2mr6457616qkk.298.1618841479402; Mon, 19 Apr 2021 07:11:19 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:19 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:11 -0300 Message-Id: <20210419141024.8174-15-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 14/87] avcodec: Remove remnants of user-visiable HW acceleration API 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: iDM/o/WkFP6h From: Andreas Rheinhardt Disabled and deprecated in 3536a3efb9fde88d34d526a51b1080247326cd6e. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 21 --------------------- libavcodec/utils.c | 11 ----------- libavcodec/version.h | 3 --- 3 files changed, 35 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7c6f5c1fc0..ff684d17e1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3778,27 +3778,6 @@ void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size); */ unsigned int av_xiphlacing(unsigned char *s, unsigned int v); -#if FF_API_USER_VISIBLE_AVHWACCEL -/** - * Register the hardware accelerator hwaccel. - * - * @deprecated This function doesn't do anything. - */ -attribute_deprecated -void av_register_hwaccel(AVHWAccel *hwaccel); - -/** - * If hwaccel is NULL, returns the first registered hardware accelerator, - * if hwaccel is non-NULL, returns the next registered hardware accelerator - * after hwaccel, or NULL if hwaccel is the last one. - * - * @deprecated AVHWaccel structures contain no user-serviceable parts, so - * this function should not be used. - */ -attribute_deprecated -AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel); -#endif - /** * @return a positive value if s is open (i.e. avcodec_open2() was called on it * with no corresponding avcodec_close()), 0 otherwise. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 643ea003df..0cc3a797f8 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -841,17 +841,6 @@ const AVCodecHWConfig *avcodec_get_hw_config(const AVCodec *codec, int index) return &codec->hw_configs[index]->public; } -#if FF_API_USER_VISIBLE_AVHWACCEL -AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel) -{ - return NULL; -} - -void av_register_hwaccel(AVHWAccel *hwaccel) -{ -} -#endif - unsigned int avpriv_toupper4(unsigned int x) { return av_toupper(x & 0xFF) + diff --git a/libavcodec/version.h b/libavcodec/version.h index c743d2a05c..590a8d6f4e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -84,9 +84,6 @@ #ifndef FF_API_GETCHROMA #define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_USER_VISIBLE_AVHWACCEL -#define FF_API_USER_VISIBLE_AVHWACCEL (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_UNSANITIZED_BITRATES #define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59) #endif