From patchwork Wed Feb 23 14:29:45 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: 34483 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp891598nkx; Wed, 23 Feb 2022 06:31:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+rEqefkv6MKmOyZkaPDMdU8JkZK5rl2lYfinEXjXXzHeW/KAdAp29BkmHnc+aUbD5OK7v X-Received: by 2002:a50:baaa:0:b0:410:a098:2a7f with SMTP id x39-20020a50baaa000000b00410a0982a7fmr31494036ede.53.1645626714679; Wed, 23 Feb 2022 06:31:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626714; cv=none; d=google.com; s=arc-20160816; b=d8sftS3ppikV//4gR82Rknq0fmjNcHotqJgOSK6l7NU/R/CSVclam4bTC90e4WGspj a5f1YDGQM3OcNmzAlLFQHisNmitPMCOo/oS0MG8SD8Fb9DiOHirhyf4auTkSpAvScEUU JuyUNS3U9QZJkjf5i+S2ygJ3SKJqnkaae4xwY96j8RkypG/UgLcUWqJd7WNh04CQsyO1 AVG+aC+I77une5Fh1LGpD+SSMvHLYa395O4iPL8HIlb8M34PDy0TpB3GcuK34mTJOc/M aUANdx3FBEZvvXYNVokQyvcEFd/rAJEPb4WtuIcq3FLK3+YSOeWM/0EIgnguStWOpsx2 roIg== 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=szKO4GnjaohJjhjAvLE8PK9OyRlEkgiFObXmu46Tibc=; b=D+SztnN12lTSKO16n2tcu1expYXOA5QN6ev8jFycjXo1qvUN8TP1H2HKgrH2cp6zUQ GPCPH3PwjVdpAaPlGKThRbm6J/XBDdmaehO+QFgHuqVQ7TdE+Yhk2wrHXTm+Ao09Dorl DD+POLuJFd6Nxdmosh6xvRw3Vjk7a4iV57MXW+GQqnfgPsXCHLYwk5OzJOH5TEyyp6va NE/39wbPc2JRVgne7fqLSh/TBPWNEqSlFSFYQURxRDRD0wNuBwS68KiAPaOetzQQjOgS 0Jbv3l9rEEJlnbp2qVFRr7rvjgDKY9QXRwPDUbGXHN/x7k9aKPXpjWaut1DxuqcA2+Q5 KWzA== 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=nxdnZt2y; 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 f6si1594389edu.256.2022.02.23.06.31.53; Wed, 23 Feb 2022 06:31: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; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=nxdnZt2y; 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 3E85268B277; Wed, 23 Feb 2022 16:30:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53E5C68B2A5 for ; Wed, 23 Feb 2022 16:30:02 +0200 (EET) Received: by mail-wm1-f49.google.com with SMTP id i20so3482059wmc.3 for ; Wed, 23 Feb 2022 06:30:02 -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=C3jZMoC3gMheYJ7Ix925aGKwN3J0p3VN1s6IMxBah5E=; b=nxdnZt2ydhB823Sv6dwBpHE/7wssBJbpk9hsV+9toy93KPacJ/T8/wKAC8FAim0iOX AD5LPwvuMB7q6ufFR2+CfVD8rAsNrOB0NkLoC09arfF/Y7JTYwGb/sgTwQzmCxFs39oF G4FLi2YDuj5FZAc+sUtM557UTbr2wTjyU3FcQh/GAIM+N+4e2pucAvwQvE+koLTzUzAT 1dkjLGCtcvFOY5AXkJIR9rvF2SZ+3O5ol6esvI94PLcTghlkHugk68fPaVANsN384AQc UtVE7Wdy8MY2qieBrW7IKGkdLxOJUtC7ON4AH8YXFrvuTFjLzwN25yi8hN8YqxQXoDQN sZ3g== 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=C3jZMoC3gMheYJ7Ix925aGKwN3J0p3VN1s6IMxBah5E=; b=OKMkaTVKOgIpEgSj/gK9mmJNmonHwMlLyzrLcIMgHpNSWcO6kWYLHOUWobh4i4f/Cm 6qOazYcX7YrtmeYvvv5oQFE7PGEC8+FZKDo8ICCxjpSJbs29lSYKbjtgC1SLrpH1PUkV 9/am6G1GbPlbPg819n7zScma+bjG6XAACr2Iv+o/WB9iXDfXGayDPLhBvToz6VN+PvKE m0TWTgWg9HvuhWCvhJCsD9r/MHT3RtV1xmZx2rdrnCl2LLS2B0BqVTScSxHCtnHMtwtY 59SCb4Tpp6D2/5qmulfIfkcN16r5GaDF4JoCchSIa4CimZVPl8G4Dwc0gNoGX5aYlq07 oVRA== X-Gm-Message-State: AOAM531BfeD/8MIRabxXVIrLn4/jhod5TRzukdL0uUB8lBNfHKuTCXgv Wyw48JKqyyLgJHB+5vI14HbqrBUnrWnYVGja X-Received: by 2002:a7b:c341:0:b0:37b:c619:c9f4 with SMTP id l1-20020a7bc341000000b0037bc619c9f4mr7866332wmj.38.1645626601777; Wed, 23 Feb 2022 06:30:01 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id o4sm5926718wms.9.2022.02.23.06.30.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:30:01 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:45 +0200 Message-Id: <20220223142951.40366-8-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220223142951.40366-1-martin@martin.st> References: <20220223142951.40366-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/13] 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: Uct7JhBYOG1G --- 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 8f5aa12600..0f4d14574c 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -52,6 +52,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 */