From patchwork Mon Apr 19 14:09:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27023 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp557260iob; Mon, 19 Apr 2021 07:13:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2N4Q4sYdKPUGz6WQ/uDOR0Db5y+wzvG9J9qHZyawLo56cY8rkYMCzsn32Al09teXtMDJ3 X-Received: by 2002:aa7:c789:: with SMTP id n9mr18978198eds.352.1618841615199; Mon, 19 Apr 2021 07:13:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841615; cv=none; d=google.com; s=arc-20160816; b=JcjDkZM6iq7fcmD7D/G4g4hRRWJFXnCdkw9EEG2mPhxhmaqrv4TS+0yGa5xQfDL2pN CIa2L3EigSlvLQrEBOg2gGtB4JdA1lQbUy6vgkhXWfolkygwvnOfTlyeEwmoiq4Ou1aa gXzobKM5OVQzixTn4paBuv/yqaVDA/qp5G4pszSNhVBANW3f6PkVZ0NhsY+3F2J8WhLd 6xQW9uZ3Z0O2PuJw1kzkOjvUc84fKa0esULhPyndi6KIcHiagf7jZ/lyVajUqimBxsUW ZEjqJMdOUtNc0X3310WqNYQ46XE8I2/d+JIT73ybor5tHMoVoT3tBfbBqSB3oKcIkkKv gF2Q== 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=XHg44m5soiPCt6yqNzBFBtHeZiTv+VmCV9VH3hAfxqQ=; b=ATZvWMKEBsP9rb1wtfX0QoL4qIb0sWoETur0CQN6CS9mjg5770NJR5zupPgLUSxSNG 4uZoxPiChnYxHySsAbaU2qkIb+XKubbfPNqpGTNQ75m5JlFBUhuWxGJxTO/aqiWg9YQ7 3GDFvBwccXGkAUioW4YIjkufBt3ZdPUn94wK2DTWyeJu1JwP+9xln7Ia2htGp1eG33x8 rgk9UqoSx6cXELyoyZ2TDNQCT6yv15Mj2mhSc9PYhdy90xrFjZa21cTqZ4NSkG0boVOD wJ49ugU+kq1Fgtwabgjwue4DnSNDyG+oygMSLZehthBvdlek374f4aptFd1fCw+v70Lo ynFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NgzXMY17; 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 r1si11405819edp.303.2021.04.19.07.13.34; Mon, 19 Apr 2021 07:13:35 -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=NgzXMY17; 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 A75E9680CCA; Mon, 19 Apr 2021 17:11:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0F1F680C80 for ; Mon, 19 Apr 2021 17:11:34 +0300 (EEST) Received: by mail-qk1-f171.google.com with SMTP id y136so3756709qkb.1 for ; Mon, 19 Apr 2021 07:11:34 -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=9R0owzWXVNDvseqd1W6J4+lPv7LUr2KLQQjx7rev6qM=; b=NgzXMY17EEDWBlR1T9FjS/8ykkteb7c2Zo5Mtn4KTTXrXNBneFDxWDVdgOKBFyT6LV eqrr/3+0eM42VdKvnV8DdVw2uvLIFyJ4XXQRY0rVrJJukHobvNO02qP0SN1UEECfFOPu aWokI9xHSVsvltEwUqlndmlhQd45ZgsSBuMiLpELYZijWL3Ec/dAAFz2LFcPs9k/fvDo Y/YqR2A8Qm9cZaUaLYEHy/iXT0mQQVMdhSHzPaAu6a0yywRtJaEQ8Yrnzjj4Z2utLRsd jE++Z5q2OAKMMlLXft/pxESASh3BRC4sxR3/57yGyL+ByFVeJQEjb03nsLFA3X+di8xM DyYg== 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=9R0owzWXVNDvseqd1W6J4+lPv7LUr2KLQQjx7rev6qM=; b=r67KdURYVIKmLEWAF8NcubvTHojrD0O3hjh+HP6Ev2zMVb1pCO3NyNEFYzJmZDtUWM b2Miy1I0AULYf7IVYRbSBmF4gs6UIK+RDlpwhi6Krztz97WeyAT04bcuODj+kBZWiz4J mfAjFUw1ll1TIhWN9pp1z4g9CT1xjHObQK18Wz9BRKgoUPVcL+SKc6yqnnSCA0kNPZjr XeziATUpcedkp03NFi6vIcdd/Xz28lyy/bNWZgJuYU9LuO8cogeJEck1HOLBTgzPqIBE rnKydVl8AZAMfC1qVd3PLOXT0njIj8dXIG7vqURxNAXjgBgAUbBznLhjgIzDUfHUsu6y CbFA== X-Gm-Message-State: AOAM530rp12HUvUixDxbITzt8bsweQaGLVsQVK3fO3OCfyz/DVOBdOdf 4L60Uqy4nOml6nOojHyrPjt1W7NVX3U= X-Received: by 2002:a37:a008:: with SMTP id j8mr12432956qke.201.1618841493320; Mon, 19 Apr 2021 07:11:33 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:33 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:23 -0300 Message-Id: <20210419141024.8174-27-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 26/87] avcodec/imgconvert: Remove deprecated parts of pixel format 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: RBpqV4ilDFx3 From: Andreas Rheinhardt Deprecated in 617e866e25b72fa5d9f9d6bbcbd7e4bd69e63a54 and 2a54ae9df8cbc1717b3929222ac75f384e2ff240. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 19 ------------------- libavcodec/imgconvert.c | 21 --------------------- libavcodec/version.h | 3 --- 3 files changed, 43 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 315246e68e..909fb9172b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3455,25 +3455,6 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *p enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); -#if FF_API_AVCODEC_PIX_FMT -/** - * @deprecated see av_get_pix_fmt_loss() - */ -attribute_deprecated -int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt, - int has_alpha); -/** - * @deprecated see av_find_best_pix_fmt_of_2() - */ -attribute_deprecated -enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, - enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); - -attribute_deprecated -enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, - enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); -#endif - enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat * fmt); /** diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 40300f836d..96511ac7d6 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -28,27 +28,6 @@ #include "libavutil/pixdesc.h" #include "libavutil/pixfmt.h" -#if FF_API_AVCODEC_PIX_FMT -int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, - enum AVPixelFormat src_pix_fmt, - int has_alpha) -{ - return av_get_pix_fmt_loss(dst_pix_fmt, src_pix_fmt, has_alpha); -} - -enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, - enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr) -{ - return av_find_best_pix_fmt_of_2(dst_pix_fmt1, dst_pix_fmt2, src_pix_fmt, has_alpha, loss_ptr); -} - -enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, - enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr) -{ - return av_find_best_pix_fmt_of_2(dst_pix_fmt1, dst_pix_fmt2, src_pix_fmt, has_alpha, loss_ptr); -} - -#endif enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *pix_fmt_list, enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr){ diff --git a/libavcodec/version.h b/libavcodec/version.h index c502dd4fa9..0595af73de 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -78,9 +78,6 @@ #ifndef FF_API_OLD_ENCDEC #define FF_API_OLD_ENCDEC (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_AVCODEC_PIX_FMT -#define FF_API_AVCODEC_PIX_FMT (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_MPV_RC_STRATEGY #define FF_API_MPV_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 59) #endif