From patchwork Fri Nov 12 13:34:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 31386 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1841819iob; Fri, 12 Nov 2021 05:35:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJx/+SeSts8+2XRyX9yH8j8xpkhXyp2SggwN7D0iYz4tPFVfQQdGo/dpM6v0Brh5Rhz6zxk8 X-Received: by 2002:aa7:c496:: with SMTP id m22mr21528978edq.180.1636724154176; Fri, 12 Nov 2021 05:35:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636724154; cv=none; d=google.com; s=arc-20160816; b=slv2+F6f3yMk/xAoxMpq2va0vIT2oaiq4q3nJwuYPSQ780CEOb2NI6UVPBMupMTT3a jVqFbaowLmHd6soroYT2bxU7MF1KyRHwHm5PCRVxtV+ckXifeaYZbupR7b64KuNTtrRU rSR5y/7xmH6qEHifn7BoTs+DXiOCrwy/N1SKVa1DQ/qC4nfH0xSarOAZ+Cd0dIGs6FMb jEOHyOcROsczSr4Kxo6xO+iGt4lIOoXy3IS9JTgjsA1CqrTt8EP/STRyr/MBi8BirgpT oCRQFTfIka2N0F3MAUj2p55sBPtDVUx1HDuf7T3LqOQ4WoRptysn+o5/WU6vDMcQ0RCG hMLQ== 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:message-id:date:to:from :delivered-to; bh=8dJ0wTJD8brBHuZwUhIPYdX3ojfUyW7ZuKL+o7+ETw8=; b=wDL7OFUr1G9R7xEShg9vwpGV4gw79m0O31dAOHoGgz4DO4LldHYGIxrmmq+xy18hT5 OFs0IeIWMBs94zKe+uM3Q7Pxwujj/hSSPlEC8mM0JihO1DCHJPsUZhXWD69TyuTA0Q1i 54iRP8SvXboqBe+7wbGWQS3GtSmVmWvwfCbFq90U6iIbP8tQBLGGv0BzjKSHKUgOXtQv PkTldedTk2y2Zb6fx+YtJItGFlqGLIcC0vWRbW5CVd3mGHE+pK6DZpf8SLLe8nK7AoIb QAPXbay1hHu2z1YwMVRE48L4Mjt2dYP1H5diTurXirWClhFF5gV1CIyC211rQzAu+/Db 2fjw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a4si11292441ejf.311.2021.11.12.05.35.50; Fri, 12 Nov 2021 05:35:54 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A559068ABAC; Fri, 12 Nov 2021 15:35:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B02268A72F for ; Fri, 12 Nov 2021 15:35:38 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id C4D02240176 for ; Fri, 12 Nov 2021 14:35:37 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id YmRKU4PluAee for ; Fri, 12 Nov 2021 14:35:36 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 6887E240175 for ; Fri, 12 Nov 2021 14:35:36 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id C0D9B3A0631; Fri, 12 Nov 2021 14:35:32 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Nov 2021 14:34:56 +0100 Message-Id: <20211112133456.11474-1-anton@khirnov.net> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] */version.h: define FF_API macros unconditionally 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: uqaj0ZkF/6al There is no reason to wrap them in #ifndef guards, they should only be defined here and nowhere else. The define guards just add the possibility to accidentally use the same FF_API name in different libraries. --- libavcodec/version.h | 24 ------------------------ libavdevice/version.h | 2 -- libavfilter/version.h | 6 ------ libavformat/version.h | 8 -------- libavutil/version.h | 8 -------- 5 files changed, 48 deletions(-) diff --git a/libavcodec/version.h b/libavcodec/version.h index 74b8baa5f3..7d4cfa3f11 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -51,41 +51,17 @@ * at once through the bump. This improves the git bisect-ability of the change. */ -#ifndef FF_API_OPENH264_SLICE_MODE #define FF_API_OPENH264_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_OPENH264_CABAC #define FF_API_OPENH264_CABAC (LIBAVCODEC_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_UNUSED_CODEC_CAPS #define FF_API_UNUSED_CODEC_CAPS (LIBAVCODEC_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_THREAD_SAFE_CALLBACKS #define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_DEBUG_MV #define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_GET_FRAME_CLASS #define FF_API_GET_FRAME_CLASS (LIBAVCODEC_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_AUTO_THREADS #define FF_API_AUTO_THREADS (LIBAVCODEC_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_INIT_PACKET #define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_AVCTX_TIMEBASE #define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_MPEGVIDEO_OPTS #define FF_API_MPEGVIDEO_OPTS (LIBAVCODEC_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_FLAG_TRUNCATED #define FF_API_FLAG_TRUNCATED (LIBAVCODEC_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_SUB_TEXT_FORMAT #define FF_API_SUB_TEXT_FORMAT (LIBAVCODEC_VERSION_MAJOR < 60) -#endif #endif /* AVCODEC_VERSION_H */ diff --git a/libavdevice/version.h b/libavdevice/version.h index 8daeb0059a..914e156ec7 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -46,8 +46,6 @@ * dropped at a future version bump. The defines themselves are not part of * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_DEVICE_CAPABILITIES #define FF_API_DEVICE_CAPABILITIES (LIBAVDEVICE_VERSION_MAJOR < 60) -#endif #endif /* AVDEVICE_VERSION_H */ diff --git a/libavfilter/version.h b/libavfilter/version.h index 3bd3816698..24a180d818 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -50,14 +50,8 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_SWS_PARAM_OPTION #define FF_API_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 9) -#endif -#ifndef FF_API_BUFFERSINK_ALLOC #define FF_API_BUFFERSINK_ALLOC (LIBAVFILTER_VERSION_MAJOR < 9) -#endif -#ifndef FF_API_PAD_COUNT #define FF_API_PAD_COUNT (LIBAVFILTER_VERSION_MAJOR < 9) -#endif #endif /* AVFILTER_VERSION_H */ diff --git a/libavformat/version.h b/libavformat/version.h index 81ed517609..2e860b8d76 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -55,18 +55,10 @@ * at once through the bump. This improves the git bisect-ability of the change. * */ -#ifndef FF_API_LAVF_PRIV_OPT #define FF_API_LAVF_PRIV_OPT (LIBAVFORMAT_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_COMPUTE_PKT_FIELDS2 #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_AVIOCONTEXT_WRITTEN #define FF_API_AVIOCONTEXT_WRITTEN (LIBAVFORMAT_VERSION_MAJOR < 60) -#endif -#ifndef FF_API_R_FRAME_RATE #define FF_API_R_FRAME_RATE 1 -#endif #endif /* AVFORMAT_VERSION_H */ diff --git a/libavutil/version.h b/libavutil/version.h index eeb33b388c..5ebef06829 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,18 +105,10 @@ * @{ */ -#ifndef FF_API_D2STR #define FF_API_D2STR (LIBAVUTIL_VERSION_MAJOR < 58) -#endif -#ifndef FF_API_DECLARE_ALIGNED #define FF_API_DECLARE_ALIGNED (LIBAVUTIL_VERSION_MAJOR < 58) -#endif -#ifndef FF_API_COLORSPACE_NAME #define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58) -#endif -#ifndef FF_API_AV_MALLOCZ_ARRAY #define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58) -#endif /** * @}