From patchwork Fri Mar 11 12:18:25 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: 34688 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1638241nkb; Fri, 11 Mar 2022 04:19:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxQjmEk93ZiZLXEVbTiP7F0GyNhBhDN2316H0bugWpjj7bKvd9wElmgEzE9epmlb90akiFQ X-Received: by 2002:a17:907:9689:b0:6db:9df1:f3b5 with SMTP id hd9-20020a170907968900b006db9df1f3b5mr3217541ejc.84.1647001154386; Fri, 11 Mar 2022 04:19:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647001154; cv=none; d=google.com; s=arc-20160816; b=CYPJwJZjudrkY84f08pxcPf6Zm4QrHG4ngiq4vNasJpdv5qEkvUXxzzF3EZIglGO9c YAtVksEiLM78W4T1neEOYxAZCBijU2xgVy6CgXVw9zCTdZl0WoqHZB6a5oiGOSDy9sNm 7MO4dHGBYvHcZQPdigRESIqIcL3U0ttvzER4diuuHk9vQfL224cKD+JMeJ5fuHRESV7n sc+KHH4SBRrwI2b3QVzjLK6xcSKdQaBLEEZUv/TpgVQi+4Cbr5cmCn2h5l2ddsuXilXm liCSxlUUlzVsJLVMhH+M9XAC083NUpiEOdPyQuBNw7yZL4e0RLjPwCFpy2dj3ahag0u8 bgbg== 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=sP8a3foaAAb1+BhLdNuxWZPKZ+FY6lN3L++dxsSnQEc=; b=rjqqmU5EOrEbXvG5NSWQsYBY4a0BK7Gk2iD7cFgE5BKM/YQ3AhN8W3NCTI1Hd0AlAe 37zjtLjzG6nqDIIAjNKA03+Fe5GLrxmjyhUE+eyONZ9dXh1vrUIWzu0K2ps583xzosBO H3jp9l1ZHN8ZTmZMC7jfLOcyAXHD5+F22nyxaAzXn6yj4Fq8RAa/72lLfd1hRnKvp156 gmBGVwp3AxfHzF+FbHa4WwFVSaftCVWZuF9dCQECfSp+137dsUM1OiHHUroVsitUZ7ie d2jILb3AtDAB531oGvAZPnZzBPRlp4Nrw7vxMdo1c4gw8cjvNKnudhBA8s6vTJxgt10w Iouw== 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=WgCQw6jI; 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 i8-20020a1709064fc800b006b5350fc14asi5320529ejw.573.2022.03.11.04.19.14; Fri, 11 Mar 2022 04:19:14 -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=WgCQw6jI; 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 9341768B1CD; Fri, 11 Mar 2022 14:18:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1CD268B0E7 for ; Fri, 11 Mar 2022 14:18:34 +0200 (EET) Received: by mail-lf1-f43.google.com with SMTP id w27so14766056lfa.5 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=LmL3z0DeqGqUFRopNG7RNlUG+VmmXQ/wNg5tmRkXOLU=; b=WgCQw6jI9jciU6nGUP79cVzKoxIRGlfvIf57XTyrwEGmjSwakR84UAYy28yCNKkqdd Xjv5QZAP+J0g8Kq2vuIr19eZZxJPzEWuX9XKQEnjIizVVVZ6uMuDq5f9g9h8UwqsmGLA 5Se/RIJ++iDIcZRLhd3OJCivcPdvO5ktOZ08EYh9PKF1r3vBxImLl6mZs2y/na/C9tde imzcrQLxUhlReNQgBjwyT53cRkvnPcMSisPMI+AxMz5dQGYZdTgUmQkNq9AhkE3KS7ll xRZlFfk+LvzxQstttn1AXsXF0iaSyM/YNU4+3ekgVOc5+k3/tfmGP0k1tNAeBIUH3XTz uoFQ== 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=LmL3z0DeqGqUFRopNG7RNlUG+VmmXQ/wNg5tmRkXOLU=; b=4ZnJV+HmjeNH1BhgUMptWC/2PMemVCYcgrVd4HfdMYZsmf4eyFJBO9kGKFCtd0NoJy RYRqGZON2hbfqaMQG+JHT6/wCm7jDjFqlxT4vJTm5+X+iiUlgCBy1RFrX3wVAJxa3FS/ 1+f9zom9Zej+et54Mt3rlfkMTDjwKw3V9ttD9TofNPkhrv2pQFg2vNwejI4+Ufx5geZE 9gHZxHbpb4JLg9UQ2rORIileCIiqAsi0+vBd9haQhjZ6UT+HSTVXIj0xyBYifMpkvTyL szXsiSC8PuPEddkg4l2inTBOfE9g8JrwIKWpwSXG9EZ4I1nH84U1TSAz19unR7rTDDnf pXUg== X-Gm-Message-State: AOAM531ee4gio8YwdmIE0l5jhkMg1Xo0ivn1kDFGXhy1avsYT5jHZ9eD KT5LegRPFbmxrFGGOy9tF7C6NMAIAQUdvyZo X-Received: by 2002:ac2:48bc:0:b0:448:373b:dcb2 with SMTP id u28-20020ac248bc000000b00448373bdcb2mr6060348lfg.417.1647001114259; Fri, 11 Mar 2022 04:18:34 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id u25-20020a2e91d9000000b00247e2fa0e8asm1723288ljg.92.2022.03.11.04.18.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 11 Mar 2022 04:18:33 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 14:18:25 +0200 Message-Id: <20220311121830.5653-4-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 4/9] libpostproc: 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: yL8suW4AY3WH --- fftools/cmdutils.c | 1 + fftools/ffprobe.c | 1 + libpostproc/Makefile | 1 + libpostproc/postprocess.c | 1 + libpostproc/postprocess.h | 2 +- libpostproc/version.h | 3 ++- libpostproc/version_major.h | 31 +++++++++++++++++++++++++++++++ 7 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 libpostproc/version_major.h diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 21ec11226e..f52015708c 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -39,6 +39,7 @@ #include "libswscale/swscale.h" #include "libswresample/swresample.h" #include "libpostproc/postprocess.h" +#include "libpostproc/version.h" #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 04160d9674..203f062935 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -57,6 +57,7 @@ #include "libswscale/swscale.h" #include "libswresample/swresample.h" #include "libpostproc/postprocess.h" +#include "libpostproc/version.h" #include "cmdutils.h" #include "libavutil/thread.h" diff --git a/libpostproc/Makefile b/libpostproc/Makefile index 34317193a8..f7debb8eeb 100644 --- a/libpostproc/Makefile +++ b/libpostproc/Makefile @@ -4,6 +4,7 @@ FFLIBS = avutil HEADERS = postprocess.h \ version.h \ + version_major.h \ OBJS = postprocess.o diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index 2ca7a3779d..b954dc2eaa 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -89,6 +89,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks //#define DEBUG_BRIGHTNESS #include "postprocess.h" #include "postprocess_internal.h" +#include "version.h" #include "libavutil/avstring.h" #include "libavutil/ppc/util_altivec.h" diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h index ba456cf3e0..cf4e78c83a 100644 --- a/libpostproc/postprocess.h +++ b/libpostproc/postprocess.h @@ -34,7 +34,7 @@ * @{ */ -#include "libpostproc/version.h" +#include "libpostproc/version_major.h" /** * Return the LIBPOSTPROC_VERSION_INT constant. diff --git a/libpostproc/version.h b/libpostproc/version.h index e8bd6afdc8..4459d251d4 100644 --- a/libpostproc/version.h +++ b/libpostproc/version.h @@ -28,7 +28,8 @@ #include "libavutil/version.h" -#define LIBPOSTPROC_VERSION_MAJOR 56 +#include "version_major.h" + #define LIBPOSTPROC_VERSION_MINOR 4 #define LIBPOSTPROC_VERSION_MICRO 100 diff --git a/libpostproc/version_major.h b/libpostproc/version_major.h new file mode 100644 index 0000000000..7afc4dbb72 --- /dev/null +++ b/libpostproc/version_major.h @@ -0,0 +1,31 @@ +/* + * Version macros. + * + * 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 POSTPROC_VERSION_MAJOR_H +#define POSTPROC_VERSION_MAJOR_H + +/** + * @file + * Libpostproc version macros + */ + +#define LIBPOSTPROC_VERSION_MAJOR 56 + +#endif /* POSTPROC_VERSION_MAJOR_H */