From patchwork Wed Feb 23 14:29:46 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: 34478 X-Google-Smtp-Source: ABdhPJzDG5YjXGlrjNrXd+9XMG01mez1++4jUR/yE7MTvbbCl3GrSw9GTrQg1TxOPAwvs2m024sh X-Received: by 2002:a17:906:2a85:b0:6ce:36bd:bcd9 with SMTP id l5-20020a1709062a8500b006ce36bdbcd9mr26983eje.318.1645626674200; Wed, 23 Feb 2022 06:31:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626674; cv=none; d=google.com; s=arc-20160816; b=mMM/w5jdBW608y/A2b7ugrdM9+vziuIz/G8J+US0JULOC00jg2+Za/zsX4gyEsXpx2 vxpDg7Yv8otnpC0+tBshyhDP+aath1VewnlN1EtLUDxeLHrUBPlihvhqzJplofUpAqky JDor4Kl4Cny1jCBfzEYJTgw2lW27fexIkljqfT6WljMYDVAb/2pLqHv7KeXL8L/rlhM0 kAlwwtywL3t1Xq1r52r0ONnzdc4EEx1+7FCRWVWTI5Aoi2QeLKM7k927lBF1h8Y2h4Oc XRLZzQAw0U2/+bwtS+L41XoJe28E/38vqouJBUT/6MfywV8jdFND3ZrRyVLMQtdTYq9p Vnmw== 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=XgEs4tCBxmmaoD9i/A6ilF3OcMTwitfarknwQsnKk1g=; b=AAXZrttf/uwxpzt46wQTc+t/MkMohAxANVTSCh9cJjHbYSw/w7gTDkdLydJ0C7js0e 1GfLfxZ9yNGFGR9Js7WIkHwnIiSBhtzpIyzN8TDtCU2Io6xfUI6j5lN8pttTxXJckueI qNnU0fSpUDr1kUaajRnQrnpX9oNrF90fyyGD9mycc/8y/gr6wrOp63yl2IsDmgg9wepQ KMR6xTgJBeJO9bvxuioEYhq2LY9HZFXrpu/w60NTOVnN3NFW2qBuCluox3/p5vgqtRAh PJ7WSh+uGxaHkCiAtibPKLtLWwzQcGttMPzkFgc+Jt3w07exwU1Jbd4VW4GXodIOYkw/ NgLw== 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=zE2HNUJ8; 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 cf27si14366991edb.471.2022.02.23.06.30.55; Wed, 23 Feb 2022 06:31: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=zE2HNUJ8; 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 3524568B28E; Wed, 23 Feb 2022 16:30:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA4F568B26A for ; Wed, 23 Feb 2022 16:30:03 +0200 (EET) Received: by mail-wr1-f42.google.com with SMTP id q23so5217181wra.2 for ; Wed, 23 Feb 2022 06:30:03 -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=r/3BlL/SRC0NCSCRSM/VpY4QYUGywZqqVQKKa7ozHcE=; b=zE2HNUJ8NH8OT9O7GTTO6UYcEV6K70D4ynjG+fJT4g4PrU8VF8YFbBn22AWb84Z1zq hOIuR2UehVdPioUzG8wc3vkxdpCicBhA44LsR/1e8L+UyASfZ9wiQz/nEzoajQdlpZ2D MonL3OGiZHsyVRFeMNTHHDbKKz7OhTqIn0WrZHgZrcy4uqEIm94ym0zrJ5K8dKBgn0kI 8ZqLm/luz2mkFpe6Khiq19wK3eyme2qTMEQMgg1teSQPp5tOQ5YAD8APyv+FHwAI66Oq ILt8tDpH8GEvmevyqu45gPWzh2kLHhBnhJvI8ii8OUBQX71tcadvv/nGYSt7ZpZtaDE7 hHyA== 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=r/3BlL/SRC0NCSCRSM/VpY4QYUGywZqqVQKKa7ozHcE=; b=BXQT2FO/YdowewqLRHTIDRaEHy5AbtJ1XEeQRwVRs0XsGEK/li2x7xTlECiHhhn0mO 2dqtlcj/xCHRrhFML00EM36vd4nl5cDkAqot/0R1ZidiqzhfaMeZDqjxLs8D6PtgrNak xwW7qFESidxu8VNlednqkWMC80xCD2BLpCg2B6uHyJXa57kq1JcR+s4T9de2ueV2ZK/a 3MgPzSQDF8eJVgM/GLVEpXj1qnij6ya05mubJxe+obA0FEwUbivfvMrfJI7JvxLj0jA5 0hip7f6HPlDqVFbW7UBqcJo9+OY+3+lMdNxGFeqOXC473A5tGdPLvBeZzbxW3lrNVmLS RvSw== X-Gm-Message-State: AOAM531Ez1q5Bl4AXVXIplqWAzQCu00XppWwXTImAGOLxxdcTsxyouvd QkoQpqxMqlnPpUOOeQcJdBaJ9ZmLgBjcOTh9 X-Received: by 2002:adf:d20c:0:b0:1e5:952c:34b5 with SMTP id j12-20020adfd20c000000b001e5952c34b5mr24206010wrh.82.1645626603087; Wed, 23 Feb 2022 06:30:03 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id u11sm59417218wrt.108.2022.02.23.06.30.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:30:02 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:46 +0200 Message-Id: <20220223142951.40366-9-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 08/13] 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: bdIIbXxM6Bxl --- 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 0f4d14574c..a0b9854004 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -56,6 +56,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 */