From patchwork Mon Apr 19 14:10:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27066 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp564307iob; Mon, 19 Apr 2021 07:21:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzo6OLnldWPF5czzxtq4ruhgVgTzmDkScDkcMnhNUxjFEdRapp69o24psT2BAyUmvwAwWtJ X-Received: by 2002:a17:906:944c:: with SMTP id z12mr21890533ejx.398.1618842107087; Mon, 19 Apr 2021 07:21:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842107; cv=none; d=google.com; s=arc-20160816; b=c+gq5RcmbDSLapVNA2ITRhuPiXx4RV40GC02gFpC2PGSHA1tDv2ZTReEpw9QKkwq60 2yYmI+XQbdxNS9kD+CUMyhN6aZcksmHzM6SmgbYO97wODqwIZBIBSMYjNiFYGexaAc+D 2F0u09VY5WBzHMeLvdjGIrJOOnHGifP+grSN9nReBxFaZWh+RzKwgbndyQGoEDru1S2B BYMzjjLDrI/5Pp6J/1vyIjY6WM9zOkplmrd0e3idWIRCgBgRkIrffpF5oO/hgdMPV/EW /Ka/Sp9F5tjHTQ/saCG5c1mOMvC802ZZrA04FjQISP0cn8vLBjPKEDshP2fhXjw/u+n1 AAlQ== 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=j+p756jPEJO5k+21m9hDuEBuzP9mzqI3SCwIR2QYDr4=; b=bUVDCtp408vwgVcdT67/MCSA+I+2UIJfN0h5ZalTpoytPo/7cVTC9nhQhRa93alrgL cLzBPzdhIDCRpdqEoi70SQrUv5+Seej6nsLc6yHrGVan6BnbkM4UfUI4q50EjI7KU4nI RiAl6x8GgtBH0UXgPTS5xhb29TETbsvExV17TT2o/T15qqUcc1km3aAw0ogistNn4O2Q +PYA9LOvCR1jpDHcNMZQg53T3vawMEEQ0oog7/9lMVw85byo++AhGnxh+aqKcLf6XulO 0iPk4BcAD6XL9lQ4yDPYoCYCy+K0GwfInC3DCd0569BZrJ5PrLEYH+LdjaKU253MQjZ2 4Slg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ln0q6LYF; 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 b13si8203946ede.310.2021.04.19.07.21.46; Mon, 19 Apr 2021 07:21:47 -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=ln0q6LYF; 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 D2167689CC5; Mon, 19 Apr 2021 17:12:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E3B90689C28 for ; Mon, 19 Apr 2021 17:12:25 +0300 (EEST) Received: by mail-qv1-f50.google.com with SMTP id 30so16899477qva.9 for ; Mon, 19 Apr 2021 07:12:25 -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=2eUhbDEPJPvxfpsMWhFFFC+VhOO+xBjvZHhxYOYaGJI=; b=ln0q6LYFzld3zCcix/kjsuGQ1he9pc+02fbaAbIWGWewE2mN6zFTpSMPgUUMkTcCHz POkT5jlwl6qbxGzJFDnn2cQkbZeeK+6AJAoStzOUrTqtwFNgteUta7wbwQNac8MSsDww 1s0Fx8jPQu9r4m0pT93NQs3qvxISu2+neufj9NubveD3IIRS0V9I7ZB8TRjbdtsZ2PnY XoPWq3BUt8XpXHTwj2f/oDxAQwAxviD9HnxQePhvaHeKYwuTRVRWSDHSFyB1JLPXNQ/y EmUZafaLcMUIMZGQR6zdDYXVwV6LicOqfviNkA7WgVPxy+qIFI/S1ZM5s0773ZUKN03f gdfg== 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=2eUhbDEPJPvxfpsMWhFFFC+VhOO+xBjvZHhxYOYaGJI=; b=TqaM+Y99eMd5C5UhK5z6d+Uef2agwHAKGzDKpyqbMX0jTc9kpCxo8rgmPvRvCWAIXS Ert52flKHzmsP6phvaz7QRB4dJO9CEUzGHhxUxv4WqfS4vEGSG//9DXS8feXEbXPNi2P 9NMPt7k5xmUpTl3Vu6deVwI6V03SCFFv2FNLjOISFpil/CoTpgeO6Wc184xEZXvac/js nd9I8gmclt3wjfP1j2JttZXLZiLKMPcYUQb+9dTJx04l+NUxkQriF6HMZ6zxdU2uBYVr DrhaXe1xolEP30asFbg1AYpiSDBfna66Vj6/nvPLNX0bsy1uSiZN8LzyZ4aB8GHbnJZ9 DrmA== X-Gm-Message-State: AOAM532cSrFFhFpL+CiLqjNjmwMhwk8K6mmVYzE6IttR43SAXGqubSdM pLBJBB5ld9O9LcUNTPh3a4tTo7y60Ik= X-Received: by 2002:ad4:458b:: with SMTP id x11mr21505943qvu.36.1618841544603; Mon, 19 Apr 2021 07:12:24 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:24 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:10:05 -0300 Message-Id: <20210419141024.8174-69-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 68/87] avutil/frame: Remove deprecated getters and setters 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: Zh5o6E0UyOow From: Andreas Rheinhardt Deprecated in 7df37dd319f2d9d3e1becd5d433884e3ccfa1ee2. Signed-off-by: Andreas Rheinhardt --- libavutil/frame.c | 14 ------------- libavutil/frame.h | 50 --------------------------------------------- libavutil/version.h | 3 --- 3 files changed, 67 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index e29008752c..7d5a36b2f1 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -27,20 +27,6 @@ #include "samplefmt.h" #include "hwcontext.h" -#if FF_API_FRAME_GET_SET -MAKE_ACCESSORS(AVFrame, frame, int64_t, best_effort_timestamp) -MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_duration) -MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_pos) -MAKE_ACCESSORS(AVFrame, frame, int64_t, channel_layout) -MAKE_ACCESSORS(AVFrame, frame, int, channels) -MAKE_ACCESSORS(AVFrame, frame, int, sample_rate) -MAKE_ACCESSORS(AVFrame, frame, AVDictionary *, metadata) -MAKE_ACCESSORS(AVFrame, frame, int, decode_error_flags) -MAKE_ACCESSORS(AVFrame, frame, int, pkt_size) -MAKE_ACCESSORS(AVFrame, frame, enum AVColorSpace, colorspace) -MAKE_ACCESSORS(AVFrame, frame, enum AVColorRange, color_range) -#endif - #define CHECK_CHANNELS_CONSISTENCY(frame) \ av_assert2(!(frame)->channel_layout || \ (frame)->channels == \ diff --git a/libavutil/frame.h b/libavutil/frame.h index 43345bcdee..853d4cabec 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -651,56 +651,6 @@ typedef struct AVFrame { AVBufferRef *private_ref; } AVFrame; -#if FF_API_FRAME_GET_SET -/** - * Accessors for some AVFrame fields. These used to be provided for ABI - * compatibility, and do not need to be used anymore. - */ -attribute_deprecated -int64_t av_frame_get_best_effort_timestamp(const AVFrame *frame); -attribute_deprecated -void av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val); -attribute_deprecated -int64_t av_frame_get_pkt_duration (const AVFrame *frame); -attribute_deprecated -void av_frame_set_pkt_duration (AVFrame *frame, int64_t val); -attribute_deprecated -int64_t av_frame_get_pkt_pos (const AVFrame *frame); -attribute_deprecated -void av_frame_set_pkt_pos (AVFrame *frame, int64_t val); -attribute_deprecated -int64_t av_frame_get_channel_layout (const AVFrame *frame); -attribute_deprecated -void av_frame_set_channel_layout (AVFrame *frame, int64_t val); -attribute_deprecated -int av_frame_get_channels (const AVFrame *frame); -attribute_deprecated -void av_frame_set_channels (AVFrame *frame, int val); -attribute_deprecated -int av_frame_get_sample_rate (const AVFrame *frame); -attribute_deprecated -void av_frame_set_sample_rate (AVFrame *frame, int val); -attribute_deprecated -AVDictionary *av_frame_get_metadata (const AVFrame *frame); -attribute_deprecated -void av_frame_set_metadata (AVFrame *frame, AVDictionary *val); -attribute_deprecated -int av_frame_get_decode_error_flags (const AVFrame *frame); -attribute_deprecated -void av_frame_set_decode_error_flags (AVFrame *frame, int val); -attribute_deprecated -int av_frame_get_pkt_size(const AVFrame *frame); -attribute_deprecated -void av_frame_set_pkt_size(AVFrame *frame, int val); -attribute_deprecated -enum AVColorSpace av_frame_get_colorspace(const AVFrame *frame); -attribute_deprecated -void av_frame_set_colorspace(AVFrame *frame, enum AVColorSpace val); -attribute_deprecated -enum AVColorRange av_frame_get_color_range(const AVFrame *frame); -attribute_deprecated -void av_frame_set_color_range(AVFrame *frame, enum AVColorRange val); -#endif #if FF_API_COLORSPACE_NAME /** diff --git a/libavutil/version.h b/libavutil/version.h index 54b09534a2..81f8690e01 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,9 +105,6 @@ * @{ */ -#ifndef FF_API_FRAME_GET_SET -#define FF_API_FRAME_GET_SET (LIBAVUTIL_VERSION_MAJOR < 57) -#endif #ifndef FF_API_PSEUDOPAL #define FF_API_PSEUDOPAL (LIBAVUTIL_VERSION_MAJOR < 57) #endif