From patchwork Fri Mar 11 12:18:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 34687 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1638124nkb; Fri, 11 Mar 2022 04:19:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJyjsll8sXWHUanSDVW/erdXICNB5QS4bwQ7YLJgkBvcRrQrYFQp2uiytProvURR4NFEwH9S X-Received: by 2002:a17:906:7746:b0:6ce:a12e:489f with SMTP id o6-20020a170906774600b006cea12e489fmr7926201ejn.551.1647001144338; Fri, 11 Mar 2022 04:19:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647001144; cv=none; d=google.com; s=arc-20160816; b=FusyJmb5IDsEr9dprdQ4MVRu5zQaVzTnaFTG/0SlA16ift8F+OPLARnZ2NxC/3ARwM enFvana4uLx5sqOC6g0a99X4s2P1WcCNeUovoM8MKivIPoe9haOhqUBBV1/eI98jdCl3 uTVPKCHRk9hiCC5YcWN4GOIBjXwXHGpqnWOMa4XQvVix8nrFbIQoeU/BSmADI008J1oZ VLoGYRZQhIF09nmfFMJZfJj9jiQnLzbiRziM5GgAelwNsy4IF4XJ+yw+NSkLKFvcBU8g fmW5NglVRdZzxBPt/+GC2e3THkUvPKqXlXlt5Qc1JlzaVXEgbbc5pR7fLy2Xz3YYM8vf BOYg== 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=h/Jdey78A/0yl2zQ/NeBAGgrjVJe1MppFyiRBYRDS5g=; b=L3PUUpbqkg7G05rLf1BxPFlr2Dp3Spq6hyMAfPN/5wNl3VfKTMdtbIxZcpLcz18G6N 6XOkKdE6/txB7xUwOLqIHL2Q5an1/44zMCCYwHka34Pun9Y5o5ESAqEqwTB2fiCMCGVO /NO8CjiUJheJ0b3Fkw+l6OdDfBpGuLZxRB+Ys5Ixj+003fVJjeoos7dI9LjHQ8L4QhVh B553JzTV5q/SaqBTUNela7NWkDrzcBITVvRQHRnPXpy4ShWvRDzgAcjDbNLUO+5AE/7W DbLrLyPaotroDJEP7WOS8hkIFcxg7lufzvIEDeWJC8bCyV5dx2nMFCNhrMPwLiJAtCFl a0VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=WAf9mzLR; 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 m24-20020a170906161800b006d06e8a6290si4393103ejd.416.2022.03.11.04.19.03; Fri, 11 Mar 2022 04:19:04 -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; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=WAf9mzLR; 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 B1B6568B180; Fri, 11 Mar 2022 14:18:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23D2768B180 for ; Fri, 11 Mar 2022 14:18:34 +0200 (EET) Received: by mail-lf1-f52.google.com with SMTP id w12so14698537lfr.9 for ; Fri, 11 Mar 2022 04:18:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=wXHQo+UKpJ8Uf1fNTyDKEsaWDUcWdkPYH9AEMoK5/Sg=; b=WAf9mzLRSHE45DdVd2uWeK+B6TeP9aqUy+9fGg2PZotcENjfHlMktg7Ad1lfOL22ju o+Llja67h3Yeazx5+5YP5Yfp1HOPTOo25hpWoMrQiJNndUByxWrSieW/Co7AvKzs26Gi l16WelUDMEe3j6hdjOvx1d4uRQhYZtSMjpK4dsQ7cQKQ/W7O/4BtxpZ3jTpugPUHN3J8 firFlnKnhNTsq1hQBZ3Swpupu+2lgEGMHE2EM8kKEBpkdUGiCHg5xmYWO2+0oYHpH1vE pY9Is+Vbxf75372gGSvLIflzPFyW7QxGd0RZEeTUmWuHOQyxec8U+UHttXYMC4lky+xB 4/0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wXHQo+UKpJ8Uf1fNTyDKEsaWDUcWdkPYH9AEMoK5/Sg=; b=MilRCDaqD4NaIza3oEVi9VnSJcZGH9ihs8oziP0LbH8589uP6RWXQdwXEgFJfm16qS a8789f/NgXrt8Ny461+izhG0IAbtF0Dz7o9Ldvjp+dCWtWGxppnY5hQXub3KhWfuqoZd gt8ToAB9kJguOcUUwnDQnqRHKNveh/vVtxmpwtXr+/sTxwyR6osN0ar4DKqf4s4HPejn c3RTsmjje8I4QaLo3IQN6yHdAOxPHvQC4XDLRp2cPNKhApKcwsTXDjQn99x15Q/AMRcn e8ltRAO4QEk2P6GMS/b2+BEQVRHfTNNoaudVVyK86Ta+1F/9fSRhCoAmFf8AA8T/99pI DM9g== X-Gm-Message-State: AOAM530A6l5PzLAgXxC+L8IzxGtqVsAPrsqhVQbDN7/FsS2KzCQLeU9u FeSH12u7EJWjgfBjlRGavOcG3+hayFUAPCP5 X-Received: by 2002:a05:6512:1698:b0:443:1626:2980 with SMTP id bu24-20020a056512169800b0044316262980mr6002441lfb.397.1647001113354; Fri, 11 Mar 2022 04:18:33 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id n13-20020a056512388d00b0044331f8f1f8sm1583448lft.128.2022.03.11.04.18.32 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 11 Mar 2022 04:18:32 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 14:18:24 +0200 Message-Id: <20220311121830.5653-3-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220311121830.5653-1-martin@martin.st> References: <20220311121830.5653-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/9] libavdevice: Split version.h 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: cgtAzxPuUZMJ --- fftools/cmdutils.c | 1 + fftools/ffprobe.c | 1 + libavdevice/Makefile | 1 + libavdevice/avdevice.c | 1 + libavdevice/avdevice.h | 2 +- libavdevice/version.h | 10 ++-------- libavdevice/version_major.h | 37 +++++++++++++++++++++++++++++++++++++ 7 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 libavdevice/version_major.h diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 87f410e975..21ec11226e 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -35,6 +35,7 @@ #include "libavformat/version.h" #include "libavfilter/avfilter.h" #include "libavdevice/avdevice.h" +#include "libavdevice/version.h" #include "libswscale/swscale.h" #include "libswresample/swresample.h" #include "libpostproc/postprocess.h" diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 7e70b549f3..04160d9674 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -53,6 +53,7 @@ #include "libavutil/timecode.h" #include "libavutil/timestamp.h" #include "libavdevice/avdevice.h" +#include "libavdevice/version.h" #include "libswscale/swscale.h" #include "libswresample/swresample.h" #include "libpostproc/postprocess.h" diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 53efda0514..99fea7133a 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -3,6 +3,7 @@ DESC = FFmpeg device handling library HEADERS = avdevice.h \ version.h \ + version_major.h \ OBJS = alldevices.o \ avdevice.o \ diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 8f460c7564..833d200054 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -22,6 +22,7 @@ #include "avdevice.h" #include "internal.h" #include "config.h" +#include "version.h" #include "libavutil/ffversion.h" const char av_device_ffversion[] = "FFmpeg version " FFMPEG_VERSION; diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 6f24976dcc..6de0e33819 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -19,7 +19,7 @@ #ifndef AVDEVICE_AVDEVICE_H #define AVDEVICE_AVDEVICE_H -#include "version.h" +#include "version_major.h" /** * @file diff --git a/libavdevice/version.h b/libavdevice/version.h index 05234e7f21..513c0bb1bc 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -27,7 +27,8 @@ #include "libavutil/version.h" -#define LIBAVDEVICE_VERSION_MAJOR 59 +#include "version_major.h" + #define LIBAVDEVICE_VERSION_MINOR 5 #define LIBAVDEVICE_VERSION_MICRO 100 @@ -41,11 +42,4 @@ #define LIBAVDEVICE_IDENT "Lavd" AV_STRINGIFY(LIBAVDEVICE_VERSION) -/** - * FF_API_* defines may be placed below to indicate public API that will be - * 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. - */ -#define FF_API_DEVICE_CAPABILITIES (LIBAVDEVICE_VERSION_MAJOR < 60) - #endif /* AVDEVICE_VERSION_H */ diff --git a/libavdevice/version_major.h b/libavdevice/version_major.h new file mode 100644 index 0000000000..d255ff6992 --- /dev/null +++ b/libavdevice/version_major.h @@ -0,0 +1,37 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVDEVICE_VERSION_MAJOR_H +#define AVDEVICE_VERSION_MAJOR_H + +/** + * @file + * @ingroup lavd + * Libavdevice version macros + */ + +#define LIBAVDEVICE_VERSION_MAJOR 59 + +/** + * FF_API_* defines may be placed below to indicate public API that will be + * 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. + */ +#define FF_API_DEVICE_CAPABILITIES (LIBAVDEVICE_VERSION_MAJOR < 60) + +#endif /* AVDEVICE_VERSION_MAJOR_H */