From patchwork Fri Aug 25 15:09:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4838 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp450332jao; Fri, 25 Aug 2017 08:11:29 -0700 (PDT) X-Received: by 10.28.26.3 with SMTP id a3mr1401146wma.60.1503673889603; Fri, 25 Aug 2017 08:11:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503673889; cv=none; d=google.com; s=arc-20160816; b=FgaFyNbWgSTn0AMnuGMpbfbF47BgdXHTRaYPeLbr3c+I7nDrdFBkK8BqNA9raE0xE/ pWQUrOIBbfL1DZTqLiOZxeuRFXRkKUNLI6oi4a9Utnt3OCTmrzJGp0i+x1rmB2uIS5N9 XcyYoyn3C3oHA8ThLkovr8es/MwsN4GCF9uaWOcpf6T0nFDpCShno22OSjD4CTs89yWq SiNL9mme76N9Mb9/bzD/K6QaV0Z0KUcyUOfWd+Dl3PrvocR6VDRWemqcCCGF9jQTQx4G R+5DYN4RtJyNAz6nUrUADOnbfABMQbTTJm+g0K4cEB6IhX9ZxbOjWqLgby58YD7mrov0 ErQw== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=gORXznJIQNnh254D/TNfg8JFciOjcS1lqAGubCplkxs=; b=SwTlvejSUw6HvJ/U3YxomMWiBIpSSUfSiU6/RiwDreX7hUSnVf2Fi8DeAqzh1yZzBP xIBT1MF3Kq9gfXqCPMx61Gr3yLBOYE/yAdnxwFVrO3exgXGkz7aONOhquU4S2Gj/6Bug xswu01PabMgxtjh3qDX3Vb9vRVSkaXMuUAq+Rk6T2P/2anMtRaUXs5Q/f9PfqTAwTL2+ tOAknUHTm5uAuaZcfDG1E7fOdL4HBomNo4lPBVGATd3aBDgJUzWUkKv3e4BQHKvi5Ber haFFHGS48r8AOlZmMUZDQk0mG3bALwGu/PLYDzXYxwRizlc5zcAjYmYx3caLl2NvnlMx nrnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=MMOgaKgN; 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 i200si1414547wmd.117.2017.08.25.08.11.04; Fri, 25 Aug 2017 08:11:29 -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=MMOgaKgN; 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 B9DD8689A9D; Fri, 25 Aug 2017 18:10:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB934689A7C for ; Fri, 25 Aug 2017 18:10:45 +0300 (EEST) Received: by mail-qt0-f196.google.com with SMTP id g13so72542qta.4 for ; Fri, 25 Aug 2017 08:10:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=1FTuJAmZoDm5LDu/NmVx6WyqcT+CNE0SulHtLwcsI2o=; b=MMOgaKgNMaMrscsi9oPpWU55beo8LAUDnk4Oe+jgRparGSP1+DY3j4nVO6LszWOmRh yr61KBX6HNzkxVrlbIQHmMjdvmc+osr32JYMdIopAxem7YBjfMF74USV1eB5gau7+ojB 9XCYxO1H91jYA2I9oEwF+DWEnRiarUud478RPF3o1xJd79zdEQTvS7FDRdL9v0rrPRBS KZGzJBczvTFlHNRrstpEeUzPAhEOHnBBAIIkMetKlp/548BP59Tmi8A0SPymgvddNUQ4 PbBMY3NDmEA9joBvyAzvhwEf3e7UfuPffhyStpNUQLAsMY0yZwdriOBQZWNHMB87jukV g3fA== 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; bh=1FTuJAmZoDm5LDu/NmVx6WyqcT+CNE0SulHtLwcsI2o=; b=Up4kmLIsfruvLvNiPj357yoC9CCxzr+LKQhfp9JhdaXeBCH0csMRCEEeSR4spC6Gxn OP3QOHGyQtZqh3P36u75ghRMBlpa5/QcTnV1B3/r2HgCBhYYj3Y6m1M0j26Ja2k4If7I atDv7A5MUaTb1mlWGqPX5WCC9TNUSSjU8tC5XwBFM3MPhy5xZosH0PRgUZcix0wIww19 Hy+16QVg7mjYp56iGxqrSE6y6oZROWE4a9TphZZPqQ5zd1fafkfzk9XMRCtAjM+2QZlv bsfSOvnOOJmTC5UB0mloaRXq4RbS5wQuUgftwdpSa6gKdEt8TrFZF5y95NmiihrImHfV RuRw== X-Gm-Message-State: AHYfb5gu8EZRmnqa0SFmlcGIuRhGFfVccI+IwAx3rxlBrC6Gi9CKH7GP PR51Q7OyMPzOUoRW X-Received: by 10.200.39.46 with SMTP id g43mr14289944qtg.293.1503673853075; Fri, 25 Aug 2017 08:10:53 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id o19sm4228411qkl.25.2017.08.25.08.10.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Aug 2017 08:10:52 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Aug 2017 12:09:53 -0300 Message-Id: <20170825150953.2128-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.3 Subject: [FFmpeg-devel] [PATCH] avcodec: make the avcodec_get_chroma_sub_sample deprecation effective 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" --- libavcodec/avcodec.h | 16 ++++------------ libavcodec/version.h | 6 +++--- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c594993766..655555092a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -5665,22 +5665,14 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, * @{ */ +#if FF_API_GETCHROMA /** - * Utility function to access log2_chroma_w log2_chroma_h from - * the pixel format AVPixFmtDescriptor. - * - * This function asserts that pix_fmt is valid. See av_pix_fmt_get_chroma_sub_sample - * for one that returns a failure code and continues in case of invalid - * pix_fmts. - * - * @param[in] pix_fmt the pixel format - * @param[out] h_shift store log2_chroma_w - * @param[out] v_shift store log2_chroma_h - * - * @see av_pix_fmt_get_chroma_sub_sample + * @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 diff --git a/libavcodec/version.h b/libavcodec/version.h index 7473000579..48e57bd86b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -60,9 +60,6 @@ #ifndef FF_API_AVCODEC_RESAMPLE #define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT #endif -#ifndef FF_API_GETCHROMA -#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_MISSING_SAMPLE #define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58) #endif @@ -238,6 +235,9 @@ #ifndef FF_API_TAG_STRING #define FF_API_TAG_STRING (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_GETCHROMA +#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #endif /* AVCODEC_VERSION_H */