From patchwork Fri Mar 11 12:18:22 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: 34685 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1637877nkb; Fri, 11 Mar 2022 04:18:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJybm5vlqLvmy3gKE0yZNZh/fIleLSwrWUiKnVXw+ZXqgo1qkoG82b57hM7tQzIqtug7iDZF X-Received: by 2002:a17:906:7942:b0:6da:bdb1:3388 with SMTP id l2-20020a170906794200b006dabdb13388mr8281134ejo.236.1647001122372; Fri, 11 Mar 2022 04:18:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647001122; cv=none; d=google.com; s=arc-20160816; b=U4d+aivXLIeT4hBfKJ+OUz/DVwm3bAd2s+Iezn5jLTF/l1fFW+e2D9m14jYn6RbTPF imHYkM2shgPzhQh+aPnsw8lVexyqVqA55+bFWgY+/VOlDkNZkCm5jyTz+51GYExL+uIv mldDF+1EkSzIA1i5qR/1zCDqN6ov1JO7nR5/tPautiKSV/hZjbrhtsKlAyZJEuK9Qlc9 fNUaYHxTkXKdEf9fY+tc8+pGIuqhdHn0fnCW5cN+K/pNYZ4+efo8h2T7/y/tgsyVaHHK iq18kVaZmpOPY9z3EZ7elwpvsp3u5uY5nR60sMeQdqtsPQh9+R3sTH41X6Zh3TrkwdfI GdzQ== 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 :dkim-signature:delivered-to; bh=yZGvtXT8n5rjABVUTovKAey2hyRHbq8AyUiIhCwjd/w=; b=hv2QZ77kKaMukwXixPgK2XDbNSqkZjpjlepQz3urAvtU82e91A8Y6rwl6g8NSpZtDS JU3oiHGQg9wBOOTF1QHISnt9fBYT+gsdjS6KpTOLYIZeabQmT3CIUHrNAhGv62nGZ58R vJT+nsCtJaryViZXABS4B7xP9hMVLoqBW60Q+/J+BKj36zwbaHBAW4Ltn8jisgI8tUcy cddVNS0FGQcdUcjBh923R6LikBDc1+DqnI3+7d3oWyaU6xoC+bRIbSm68UZqtfGjzMG1 0McVUj4Y73FLrfFWqzhAGTDz4iaAoO3QoQDPj1xZ7l0nn1auNTZDYyR29abBP+ugesno 42MA== 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=gwZ4UlLD; 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 z2-20020a05640240c200b00417bdbad510si1066559edb.382.2022.03.11.04.18.41; Fri, 11 Mar 2022 04:18:42 -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=gwZ4UlLD; 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 CD55D68B178; Fri, 11 Mar 2022 14:18:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A93968803D for ; Fri, 11 Mar 2022 14:18:32 +0200 (EET) Received: by mail-lj1-f177.google.com with SMTP id r22so11806312ljd.4 for ; Fri, 11 Mar 2022 04:18:32 -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:mime-version :content-transfer-encoding; bh=KKQxacoaocSm21VXuwXF4vnOGptus4n9I1qVQnKhhyg=; b=gwZ4UlLDl0ADtyOXX4/dk8owDKwoo6HDDvFnGGmdJQyGyIlDccBkpX+9+YaLBXHoaw w0f3YOa8um5ycd5oBgVn8mo4vP7wXoBY4IZGkkfWzl0qZabu1JPcB+WW0rJBfu3mo5ig gvZzj9MP/T/sg+xmqGpvBycXecrL4Ai5Y8zEDdH1r9WhebEKyJS72KPkpIe+eot/APWe t+TBbNnVkB+SsgXbcxTXN0W5PcsKXIA96LpFK171HHLNr6if7cebb7FWqKMi6o5Vdy1r ZjnqiPJU2rPnxQUq/mguWz5Mn1u/pM7q4k5VVwmLbCyJw+1S7QA2Q+rJpdfJ5Y55R2Yi /LNA== 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:mime-version :content-transfer-encoding; bh=KKQxacoaocSm21VXuwXF4vnOGptus4n9I1qVQnKhhyg=; b=UHlnb7GUPfG67v/+ha0MkF1brn9iN+H1X7TYGIKv7kxXT1Sw7TLX7uHZnUe2N1er/z UEqNo5AHZhyvTlkF3zfsnH4aa+/7ppKWlQZXhXBAfMCc5JA4cJnNyCMk2ONxMFvRgEmH LggZYPyq2WmjGo7OzGp3E6h4Dwm1tWcZNU/L6lB7Sq4ck84udAuUw5HTU/AuEhr5hN8L 9MuOmF5sfBksAx0WIxokzZvpjgq+xqXH5yx4S3jL02j2BtJhiQdEh+bPH/kRurzo9suF Uu0eJPppdojSJ+EGD055ExjaQQXrcftRHSmGR5NKkhae0MnvMEbVqBBYdIp/wIujLb9L fmYA== X-Gm-Message-State: AOAM531MAFM5buBj8bCNjtwfklN2tWQKMp592Jk+XmaVbTlevozIEmBO p8xjix4vG2n+7J6ZV8cKb7/86GmbaaZYSMVC X-Received: by 2002:a2e:b60e:0:b0:248:1b9:a88a with SMTP id r14-20020a2eb60e000000b0024801b9a88amr5676351ljn.270.1647001111634; Fri, 11 Mar 2022 04:18:31 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id s5-20020ac24645000000b00448628b8462sm940908lfo.249.2022.03.11.04.18.30 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 11 Mar 2022 04:18:31 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 14:18:22 +0200 Message-Id: <20220311121830.5653-1-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/9] libavcodec: 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: LCU7sdHaFk/L This avoids including version.h in all source files, avoiding unnecessary rebuilds when the version number is bumped. Only version_major.h is included by the main header, which defines availability of e.g. FF_API_* macros, and which is bumped much less often. --- fftools/cmdutils.c | 1 + fftools/ffmpeg.c | 1 + fftools/ffprobe.c | 1 + libavcodec/Makefile | 1 + libavcodec/aacenc.c | 1 + libavcodec/avcodec.c | 1 + libavcodec/avcodec.h | 2 +- libavcodec/codec.h | 2 +- libavcodec/dpxenc.c | 1 + libavcodec/j2kenc.c | 1 + libavcodec/libvorbisenc.c | 1 + libavcodec/mjpegenc_common.c | 1 + libavcodec/mpeg4videoenc.c | 1 + libavcodec/options_table.h | 2 +- libavcodec/packet.h | 2 +- libavcodec/pthread_frame.c | 2 +- libavcodec/tiffenc.c | 1 + libavcodec/vaapi_encode_h264.c | 1 + libavcodec/vc2enc.c | 1 + libavcodec/version.h | 28 ++--------------- libavcodec/version_major.h | 55 ++++++++++++++++++++++++++++++++++ libavformat/movenc.c | 1 + 22 files changed, 77 insertions(+), 31 deletions(-) create mode 100644 libavcodec/version_major.h diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 4b50e15eef..869b5ec012 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -55,6 +55,7 @@ #include "libavutil/ffversion.h" #include "libavutil/version.h" #include "libavcodec/bsf.h" +#include "libavcodec/version.h" #include "cmdutils.h" #if HAVE_SYS_RESOURCE_H #include diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 9a3fdc636d..7b8342fd0e 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -64,6 +64,7 @@ #include "libavutil/thread.h" #include "libavutil/threadmessage.h" #include "libavcodec/mathops.h" +#include "libavcodec/version.h" #include "libavformat/os_support.h" # include "libavfilter/avfilter.h" diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 66206b66d9..6f4ce52eb5 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -30,6 +30,7 @@ #include "libavformat/avformat.h" #include "libavcodec/avcodec.h" +#include "libavcodec/version.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index cd929da8e6..22063e43a7 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -22,6 +22,7 @@ HEADERS = ac3_parser.h \ qsv.h \ vdpau.h \ version.h \ + version_major.h \ videotoolbox.h \ vorbis_parser.h \ xvmc.h \ diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index a1004c3e98..38f2d15f78 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -41,6 +41,7 @@ #include "mpeg4audio.h" #include "sinewin.h" #include "profiles.h" +#include "version.h" #include "aac.h" #include "aactab.h" diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 92639dda6b..838c009a19 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -39,6 +39,7 @@ #include "frame_thread_encoder.h" #include "internal.h" #include "thread.h" +#include "version.h" #include "libavutil/ffversion.h" const char av_codec_ffversion[] = "FFmpeg version " FFMPEG_VERSION; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 79af8dcc05..6e2be910dc 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -43,7 +43,7 @@ #include "codec_id.h" #include "defs.h" #include "packet.h" -#include "version.h" +#include "version_major.h" /** * @defgroup libavc libavcodec diff --git a/libavcodec/codec.h b/libavcodec/codec.h index a8147ec21f..42dd95d225 100644 --- a/libavcodec/codec.h +++ b/libavcodec/codec.h @@ -31,7 +31,7 @@ #include "libavutil/samplefmt.h" #include "libavcodec/codec_id.h" -#include "libavcodec/version.h" +#include "libavcodec/version_major.h" /** * @addtogroup lavc_core diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c index 0db6aa832d..c4f9ae09bb 100644 --- a/libavcodec/dpxenc.c +++ b/libavcodec/dpxenc.c @@ -25,6 +25,7 @@ #include "avcodec.h" #include "encode.h" #include "internal.h" +#include "version.h" typedef struct DPXContext { int big_endian; diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index c06752f43a..95573c6799 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -70,6 +70,7 @@ #include "internal.h" #include "bytestream.h" #include "jpeg2000.h" +#include "version.h" #include "libavutil/common.h" #include "libavutil/pixdesc.h" #include "libavutil/opt.h" diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index b657f0157a..36f3d78654 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -28,6 +28,7 @@ #include "audio_frame_queue.h" #include "encode.h" #include "internal.h" +#include "version.h" #include "vorbis.h" #include "vorbis_parser.h" diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index 995e2b7670..7b82644763 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -33,6 +33,7 @@ #include "mjpegenc.h" #include "mjpegenc_common.h" #include "mjpeg.h" +#include "version.h" /* table_class: 0 = DC coef, 1 = AC coefs */ static int put_huffman_table(PutBitContext *p, int table_class, int table_id, diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 094c4e5fb3..4a4adeb1c3 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -33,6 +33,7 @@ #include "mpeg4videoenc.h" #include "mpegvideoenc.h" #include "profiles.h" +#include "version.h" /* The uni_DCtab_* tables below contain unified bits+length tables to encode DC * differences in MPEG-4. Unified in the sense that the specification specifies diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 130341a2ec..7eb974672e 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -28,7 +28,7 @@ #include "libavutil/opt.h" #include "avcodec.h" -#include "version.h" +#include "version_major.h" #define OFFSET(x) offsetof(AVCodecContext,x) #define DEFAULT 0 //should be NAN but it does not work as it is not a constant in glibc as required by ANSI/ISO C diff --git a/libavcodec/packet.h b/libavcodec/packet.h index 4a349fe051..40a26db3a7 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -29,7 +29,7 @@ #include "libavutil/dict.h" #include "libavutil/rational.h" -#include "libavcodec/version.h" +#include "libavcodec/version_major.h" /** * @defgroup lavc_packet AVPacket diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 33b5a2e628..6c6a1342e0 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -33,7 +33,7 @@ #include "pthread_internal.h" #include "thread.h" #include "threadframe.h" -#include "version.h" +#include "version_major.h" #include "libavutil/avassert.h" #include "libavutil/buffer.h" diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index a6c523364a..d350a5b826 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -42,6 +42,7 @@ #include "put_bits.h" #include "rle.h" #include "tiff.h" +#include "version.h" #define TIFF_MAX_ENTRY 32 diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index ff37de1f7e..1ca885fdbc 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -34,6 +34,7 @@ #include "h264_sei.h" #include "internal.h" #include "vaapi_encode.h" +#include "version.h" enum { SEI_TIMING = 0x01, diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index bfa43b3c03..6b77c67844 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -26,6 +26,7 @@ #include "encode.h" #include "put_bits.h" #include "internal.h" +#include "version.h" #include "vc2enc_dwt.h" #include "diractab.h" diff --git a/libavcodec/version.h b/libavcodec/version.h index 408ee978ab..728ab8839d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -27,7 +27,8 @@ #include "libavutil/version.h" -#define LIBAVCODEC_VERSION_MAJOR 59 +#include "version_major.h" + #define LIBAVCODEC_VERSION_MINOR 23 #define LIBAVCODEC_VERSION_MICRO 100 @@ -41,29 +42,4 @@ #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_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. - * - * @note, when bumping the major version it is recommended to manually - * disable each FF_API_* in its own commit instead of disabling them all - * at once through the bump. This improves the git bisect-ability of the change. - */ - -#define FF_API_OPENH264_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_OPENH264_CABAC (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_UNUSED_CODEC_CAPS (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_GET_FRAME_CLASS (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_AUTO_THREADS (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_MPEGVIDEO_OPTS (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_FLAG_TRUNCATED (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_SUB_TEXT_FORMAT (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_MJPEG_PRED (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_IDCT_NONE (LIBAVCODEC_VERSION_MAJOR < 60) - #endif /* AVCODEC_VERSION_H */ diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h new file mode 100644 index 0000000000..56a9aff042 --- /dev/null +++ b/libavcodec/version_major.h @@ -0,0 +1,55 @@ +/* + * 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 AVCODEC_VERSION_MAJOR_H +#define AVCODEC_VERSION_MAJOR_H + +/** + * @file + * @ingroup libavc + * Libavcodec version macros. + */ + +#define LIBAVCODEC_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. + * + * @note, when bumping the major version it is recommended to manually + * disable each FF_API_* in its own commit instead of disabling them all + * at once through the bump. This improves the git bisect-ability of the change. + */ + +#define FF_API_OPENH264_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_OPENH264_CABAC (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_UNUSED_CODEC_CAPS (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_GET_FRAME_CLASS (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_AUTO_THREADS (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_MPEGVIDEO_OPTS (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_FLAG_TRUNCATED (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_SUB_TEXT_FORMAT (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_MJPEG_PRED (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_IDCT_NONE (LIBAVCODEC_VERSION_MAJOR < 60) + +#endif /* AVCODEC_VERSION_MAJOR_H */ diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 4c868919ae..8e3f803b38 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -42,6 +42,7 @@ #include "libavcodec/put_bits.h" #include "libavcodec/vc1_common.h" #include "libavcodec/raw.h" +#include "libavcodec/version.h" #include "internal.h" #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" From patchwork Fri Mar 11 12:18:23 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: 34686 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1638014nkb; Fri, 11 Mar 2022 04:18:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQeGEwNiTbyHZ1z4f1mUBPqNqyJugi1pmtsClgNJ/L1QQBBROHfcw84wEUhbjYauE0X9+v X-Received: by 2002:aa7:d648:0:b0:416:4b85:da68 with SMTP id v8-20020aa7d648000000b004164b85da68mr8327061edr.253.1647001133798; Fri, 11 Mar 2022 04:18:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647001133; cv=none; d=google.com; s=arc-20160816; b=gv0mq15jDx4o2OF+pTukQ+6C9Q0b5JaMG5sIf8KIt/rSHknNw/5yNEVDFUQbV9YuG5 onv23SZPNxEvwD2o8t2QNAigJFx0vjm3U8A55F9fyX7OLRUiB+RwBXWSNg6d47FVm5Ew kRQZm6c82LjwTXK7DTmUtMiEiU7ZRtCEm3uXI8uKYLY+Mo5Q0UeD8C7OeKXkJlEmso4K cFkjjVRLKqGpdR524ecFr4WHD6vwARZRBJyXSPzM4pgFlrW9SuEb6YwpuCdOG25lDZgn 7kCnU8zNjm4OJLU9mK/vQfdYsW66Uythj/eA7wExexXzQpL+m1iOCJX/e3+dz4eJDWcA pWuw== 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=7miRrokODWqXjUCdB9Q6yuUbdoW6iF0qP2Zh0FIGLEI=; b=01YpmOOk/I/+VTf7qZ4e3mZw+Gh7sPMf07jiGMjpyHHWYA1AvTPUvp+EXu58uUz8ub ct/ROoNX71iAR1JGxFZJ3epb5PKRCjjPwjn5xfnPQaewC/6bDaRDRgyhZVCeijTicx6G JygI0djLAXy2MM7Zu377i9B2o092xefBoqyEisBlkG95rDdZwS3SXaI+Kd3xcIWEM4qX IiMt1YcX1SZPjAFDmNWMUUsYo/jF2mJHcCnC1nnFgAidPMPidgEnknlApa0akS59bAN+ +wAha1NNjYAF5MlAFxqKirPo169/5egypo7shxTfzTwYvMtA0I2PS3qhjGuc9DmLnTZz 6n1g== 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=lUYr1lm3; 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 d25-20020a50fb19000000b004109b560d56si4877700edq.368.2022.03.11.04.18.53; Fri, 11 Mar 2022 04:18:53 -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=lUYr1lm3; 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 C842668B1AE; Fri, 11 Mar 2022 14:18:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 835C868B165 for ; Fri, 11 Mar 2022 14:18:33 +0200 (EET) Received: by mail-lf1-f41.google.com with SMTP id b28so3051751lfc.4 for ; Fri, 11 Mar 2022 04:18:33 -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=vWNFDeyRRJhiSHF+0yAzSvB3fJXMeIuDgzVMnVoK2RU=; b=lUYr1lm3BcLZ5WF2HUmh+8wxvvZA+sKKDX7aEXu0qgKkxofFR6leWrkikwhBtlbhxb oQ+UYmad75zkmOLQg8Z/HrimgoHZ8iJUaEX97usM1GC+A4kK3y1iZ88DgzbVNW6CCLaU ihxrMRTCcuhqvGlE5k52kUAqZtzUBNyZM9ZkVaLmQlM3yxbvuOzO0PdimYcPo+ETdugI /+u3b0dLFkzL7ZoXbUvraBgrggEwEr61dNJ23Z0+pA6xfndPjsrBen4KgJ7b+Amu+YCh Vv81VTKtry/q0lyUenH8wclmMsDmPFZodTwJPzlxRYaC8BCJvthjt59L05U1M6CzfT/B ceoA== 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=vWNFDeyRRJhiSHF+0yAzSvB3fJXMeIuDgzVMnVoK2RU=; b=o2ZGVqR/yB+OtzzN9D5CsJ75bTkEDJ0xrqwJIRZa1mNVGVigoijBK5tQsMt4VPqi4k pIUIGsVEtzhQbNJxB9WrGkgFKIS4E0zO8V8VxoyuhiAgPjrnpxXVBJLAM/Vn4dN86HbA /o2EYY+yya41Ue1jIpkWH5bXe9oxEuA03Wg48xA6VA8gPmwdQvSCRuR15r/65P8Z82UH HbmBI4SiJxq01Cy0eQrIoVXJ7DKzbAUHdkzh8wNAfGTIg0A59dwoq0iOZ7xLUOVGLWBo 1eEaTT9jPOA/vIYeaS4A72euebJc4DxZiwVzzIWTZrbAHFaRG/HU72ImLlpdJrNM9JmZ rW4w== X-Gm-Message-State: AOAM532yXQ7sKfcRkRxV09FQ3UXbb3aCR4aCeXN5Ug57ZOwundAcX0m9 c7eQyuEiy5QuBcOPjZ1WeFF4KwumytNbeeIH X-Received: by 2002:a05:6512:10c8:b0:448:3fdc:6407 with SMTP id k8-20020a05651210c800b004483fdc6407mr5701422lfg.360.1647001112462; Fri, 11 Mar 2022 04:18:32 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id q15-20020a19f20f000000b0044376b4e80bsm1579293lfh.279.2022.03.11.04.18.31 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:23 +0200 Message-Id: <20220311121830.5653-2-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 2/9] libavformat: 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: At/R7sibpa76 --- fftools/cmdutils.c | 1 + fftools/ffprobe.c | 1 + libavdevice/pulse_audio_dec.c | 1 + libavdevice/pulse_audio_enc.c | 1 + libavformat/Makefile | 1 + libavformat/avformat.h | 2 +- libavformat/avio.h | 2 +- libavformat/flacenc.c | 1 + libavformat/framehash.c | 1 + libavformat/matroskaenc.c | 1 + libavformat/mmf.c | 1 + libavformat/movenc.c | 1 + libavformat/mux.c | 1 + libavformat/mxfenc.c | 1 + libavformat/nutenc.c | 1 + libavformat/oggenc.c | 1 + libavformat/rtmpproto.c | 1 + libavformat/rtsp.c | 1 + libavformat/rtspdec.c | 1 + libavformat/utils.c | 1 + libavformat/version.h | 23 ++------------- libavformat/version_major.h | 53 +++++++++++++++++++++++++++++++++++ 22 files changed, 75 insertions(+), 23 deletions(-) create mode 100644 libavformat/version_major.h diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 869b5ec012..87f410e975 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -32,6 +32,7 @@ #include "config.h" #include "compat/va_copy.h" #include "libavformat/avformat.h" +#include "libavformat/version.h" #include "libavfilter/avfilter.h" #include "libavdevice/avdevice.h" #include "libswscale/swscale.h" diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 6f4ce52eb5..7e70b549f3 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -29,6 +29,7 @@ #include #include "libavformat/avformat.h" +#include "libavformat/version.h" #include "libavcodec/avcodec.h" #include "libavcodec/version.h" #include "libavutil/avassert.h" diff --git a/libavdevice/pulse_audio_dec.c b/libavdevice/pulse_audio_dec.c index b23d08e4d3..5a42f71ede 100644 --- a/libavdevice/pulse_audio_dec.c +++ b/libavdevice/pulse_audio_dec.c @@ -30,6 +30,7 @@ #include "libavformat/avformat.h" #include "libavformat/internal.h" +#include "libavformat/version.h" #include "pulse_audio_common.h" #include "timefilter.h" diff --git a/libavdevice/pulse_audio_enc.c b/libavdevice/pulse_audio_enc.c index 4ff425d33f..7b50517fc7 100644 --- a/libavdevice/pulse_audio_enc.c +++ b/libavdevice/pulse_audio_enc.c @@ -23,6 +23,7 @@ #include #include "libavformat/avformat.h" #include "libavformat/internal.h" +#include "libavformat/version.h" #include "libavutil/channel_layout.h" #include "libavutil/internal.h" #include "libavutil/opt.h" diff --git a/libavformat/Makefile b/libavformat/Makefile index 322c8e7896..27d553c20e 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -4,6 +4,7 @@ DESC = FFmpeg container format library HEADERS = avformat.h \ avio.h \ version.h \ + version_major.h \ OBJS = allformats.o \ avio.o \ diff --git a/libavformat/avformat.h b/libavformat/avformat.h index b4b8075ae6..d37a582838 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -319,7 +319,7 @@ #include "libavutil/log.h" #include "avio.h" -#include "libavformat/version.h" +#include "libavformat/version_major.h" struct AVFormatContext; struct AVStream; diff --git a/libavformat/avio.h b/libavformat/avio.h index ca970b1ce3..3ed9175a9b 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -33,7 +33,7 @@ #include "libavutil/dict.h" #include "libavutil/log.h" -#include "libavformat/version.h" +#include "libavformat/version_major.h" /** * Seeking works like for a local file. diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index b267197ccc..88dbe87af4 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -30,6 +30,7 @@ #include "flacenc.h" #include "id3v2.h" #include "internal.h" +#include "version.h" #include "vorbiscomment.h" diff --git a/libavformat/framehash.c b/libavformat/framehash.c index 04c40825b9..43b8ab3be2 100644 --- a/libavformat/framehash.c +++ b/libavformat/framehash.c @@ -20,6 +20,7 @@ #include "libavutil/channel_layout.h" #include "internal.h" +#include "version.h" int ff_framehash_write_header(AVFormatContext *s) { diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 38d9485288..e8df5db3bd 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -35,6 +35,7 @@ #include "isom.h" #include "matroska.h" #include "riff.h" +#include "version.h" #include "vorbiscomment.h" #include "wv.h" diff --git a/libavformat/mmf.c b/libavformat/mmf.c index 0c067a1025..e836390bff 100644 --- a/libavformat/mmf.c +++ b/libavformat/mmf.c @@ -26,6 +26,7 @@ #include "pcm.h" #include "rawenc.h" #include "riff.h" +#include "version.h" typedef struct MMFContext { int64_t atrpos, atsqpos, awapos; diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8e3f803b38..14482abe8d 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -61,6 +61,7 @@ #include "mov_chan.h" #include "movenc_ttml.h" #include "ttmlenc.h" +#include "version.h" #include "vpcc.h" static const AVOption options[] = { diff --git a/libavformat/mux.c b/libavformat/mux.c index 53eb56f0af..bd85661663 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -21,6 +21,7 @@ #include "avformat.h" #include "internal.h" +#include "version.h" #include "libavcodec/bsf.h" #include "libavcodec/internal.h" #include "libavcodec/packet_internal.h" diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 1e87dc6111..8ca67f52c6 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -58,6 +58,7 @@ #include "avc.h" #include "mxf.h" #include "config.h" +#include "version.h" extern const AVOutputFormat ff_mxf_d10_muxer; extern const AVOutputFormat ff_mxf_opatom_muxer; diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 585ce953ca..c33c16fd44 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -34,6 +34,7 @@ #include "internal.h" #include "avio_internal.h" #include "riff.h" +#include "version.h" static int find_expected_header(AVCodecParameters *p, int size, int key_frame, uint8_t out[64]) diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index a88dab8ccc..31f47dadf6 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -31,6 +31,7 @@ #include "avformat.h" #include "avio_internal.h" #include "internal.h" +#include "version.h" #include "vorbiscomment.h" #define MAX_PAGE_SIZE 65025 diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 34020bc383..88557140f7 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -42,6 +42,7 @@ #include "rtmpcrypt.h" #include "rtmppkt.h" #include "url.h" +#include "version.h" #if CONFIG_ZLIB #include diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 70c18941ca..f1992f193e 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -50,6 +50,7 @@ #include "url.h" #include "rtpenc.h" #include "mpegts.h" +#include "version.h" /* Default timeout values for read packet in seconds */ #define READ_PACKET_TIMEOUT_S 10 diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 2ada29a2d3..eee6329025 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -34,6 +34,7 @@ #include "rdt.h" #include "tls.h" #include "url.h" +#include "version.h" static const struct RTSPStatusMessage { enum RTSPStatusCode code; diff --git a/libavformat/utils.c b/libavformat/utils.c index ca61a97759..1ec413f198 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -46,6 +46,7 @@ #if CONFIG_NETWORK #include "network.h" #endif +#include "version.h" #include "libavutil/ffversion.h" const char av_format_ffversion[] = "FFmpeg version " FFMPEG_VERSION; diff --git a/libavformat/version.h b/libavformat/version.h index 44ea7c7c5d..be8ce01160 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -29,9 +29,8 @@ #include "libavutil/version.h" -// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) -// Also please add any ticket numbers that you believe might be affected here -#define LIBAVFORMAT_VERSION_MAJOR 59 +#include "version_major.h" + #define LIBAVFORMAT_VERSION_MINOR 18 #define LIBAVFORMAT_VERSION_MICRO 101 @@ -45,22 +44,4 @@ #define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_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. - * - * @note, when bumping the major version it is recommended to manually - * disable each FF_API_* in its own commit instead of disabling them all - * at once through the bump. This improves the git bisect-ability of the change. - * - */ -#define FF_API_LAVF_PRIV_OPT (LIBAVFORMAT_VERSION_MAJOR < 60) -#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60) -#define FF_API_AVIOCONTEXT_WRITTEN (LIBAVFORMAT_VERSION_MAJOR < 60) -#define FF_HLS_TS_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 60) -#define FF_API_AVSTREAM_CLASS (LIBAVFORMAT_VERSION_MAJOR > 59) - - -#define FF_API_R_FRAME_RATE 1 #endif /* AVFORMAT_VERSION_H */ diff --git a/libavformat/version_major.h b/libavformat/version_major.h new file mode 100644 index 0000000000..5f71298bcc --- /dev/null +++ b/libavformat/version_major.h @@ -0,0 +1,53 @@ +/* + * 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 AVFORMAT_VERSION_MAJOR_H +#define AVFORMAT_VERSION_MAJOR_H + +/** + * @file + * @ingroup libavf + * Libavformat version macros + */ + +// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) +// Also please add any ticket numbers that you believe might be affected here +#define LIBAVFORMAT_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. + * + * @note, when bumping the major version it is recommended to manually + * disable each FF_API_* in its own commit instead of disabling them all + * at once through the bump. This improves the git bisect-ability of the change. + * + */ +#define FF_API_LAVF_PRIV_OPT (LIBAVFORMAT_VERSION_MAJOR < 60) +#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60) +#define FF_API_AVIOCONTEXT_WRITTEN (LIBAVFORMAT_VERSION_MAJOR < 60) +#define FF_HLS_TS_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 60) +#define FF_API_AVSTREAM_CLASS (LIBAVFORMAT_VERSION_MAJOR > 59) + + +#define FF_API_R_FRAME_RATE 1 + +#endif /* AVFORMAT_VERSION_MAJOR_H */ 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 */ 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 */ From patchwork Fri Mar 11 12:18:26 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: 34689 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1638382nkb; Fri, 11 Mar 2022 04:19:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJx4VsoVfmsY2cSRwNMqRZ3qEW/xmwXZLGxIvixhX2TJi1FcJUMjFEIyBXguV4UWxV7LDJIF X-Received: by 2002:a17:906:2bd7:b0:6ce:698b:7531 with SMTP id n23-20020a1709062bd700b006ce698b7531mr7940770ejg.146.1647001165287; Fri, 11 Mar 2022 04:19:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647001165; cv=none; d=google.com; s=arc-20160816; b=O0zXnYfOBJ1JFymc4PPeXrggJMwQCFcgjBkjRNF/RAzOBbKatt4Nmr5vYph795zsWj KKCEcTzNBJuCBDf2S3JZeqXjDiYM9vjL3JYSaJ97kKgJ7/C6iZk/eBcBSkUBlijHg6qJ T43SdiKC2Iy388HCizBv6mnvDDhKkeYe0oJ6HmbWvB75mI7Pc/W39e1CpGopUrOZ3nGZ 8HpM660qd3CNZxIHHfWutaHlmXhpT+Z+2Lv0e4oB3RjSnujrLEGlJ74oBq+9Ng4qXXqq CbhKKfQSTQmvYe6VocW4KlBYL5DfFwuLl4Xa3YL/D6REVK2et0aHuc80MNR3wOR5/LJj C8vQ== 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=UL32itGZqvuodcn+qwsXG6ElLhwXkN+4mrfzXsNeKHQ=; b=gBNVls2jeSRLIQwnFBt03MzMEbMuNZWSEoUawJXsBxEQS6OUB7wTBq0wKOhsHmKFG/ Ljiio49OqIx+R0BiGTiXEbcVJDD6lwLmC19d6JsHGptUzlh8Xbod+mJ2sDOK7M7Ya32D JyIe/DJeUuprBxBnW4ZkY0ngIkGqsAVLVEuGgyKZn98syuOYdKt8qMxn+ygwv4IED2i9 hftAprG7qyK0ZCoVaA9JUyQ6yjFugTENKqjxKOTusjr1muMpvY49lxz4VlGbYmW+ywz2 JmA7ZgzUBr+cvHDNIU4tYgccqe9YKJfpQAiNdDcdrnOu/JCj3DuMha5ANABHPjT/FZb3 hJMA== 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=3OP0IVfr; 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 i15-20020a17090639cf00b006b334fffde0si4542414eje.588.2022.03.11.04.19.24; Fri, 11 Mar 2022 04:19:25 -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=3OP0IVfr; 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 8965168B1F4; Fri, 11 Mar 2022 14:18:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E427368B1A3 for ; Fri, 11 Mar 2022 14:18:35 +0200 (EET) Received: by mail-lf1-f51.google.com with SMTP id 3so14721820lfr.7 for ; Fri, 11 Mar 2022 04:18:35 -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=36PElFfX9Q7M4r8I1YqSNSEohIHcq9Hdfm/xJuUmFSY=; b=3OP0IVfr30YgnMNWRQa2dCCEgpYQHka3mS5+mHB2k5/o9TsFBE8+tIYsCRukSyPoql bb1w3W0nwZBRsf/tqde/bc2u0dLDHcMjpbkIwuJcBBo9fp+USK7inRlnfCMuHLRsua6e e4vb9Py8zlG2p+8/waEWYdMG4V/Kd0gkdNYJmOy+jB62dFES95nItpsvOnQEGrUf2MEl djajCtX7lZ6BtW+Eh85L1+bl127hhNxms5Q3IdzfaAAokM99M/FPJ0wYr4fXp8P0Gyns A4/B1Sd5pr7NzIdCoFH1nIQ6Zjq5kyBBSCmvccgzO+nqeo3ePs1UwyBT7e4IQaSwq3Y5 D4ug== 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=36PElFfX9Q7M4r8I1YqSNSEohIHcq9Hdfm/xJuUmFSY=; b=mFyqbqyFNyYCOfmC2V2WcFH5gkx1h46ysn57eD8zBdRBiM//s7Wz+RD4uVv2+D6ekl ZgsFzjJTz06FIV8/y0jpp1JonDKvwzB/G7XwDa3MDeQ1flgETpWIS4RNCOfU7Pm4xD2r ufJ8BTa0ekmClz4l3A5c1DnmnBxLTDg5qHol7hrKjh2niMP824fNM7OrHyqRsBTUcusy M9BVvc/7QgxHgaYsNqcEfWLGSDqqMNdEusut1+ojsec+4l4UZ0MIg1/D9LTSvIkZzU3u umyXgIbl298YTixWybMwof4BD8MKFWzc5dpC02SQRVNQXSgdJeTDrik3zrFoD3Kuintw 5Q1Q== X-Gm-Message-State: AOAM533lhVWSEYvY/qV9UgmoUQW82exTZphBtT7tfz6vk+CvjqASACO/ O35nIQs0FUdrSsZq5v7VUX+xO9Ucv2QdVo6h X-Received: by 2002:a19:6d0b:0:b0:448:5b24:c198 with SMTP id i11-20020a196d0b000000b004485b24c198mr5811094lfc.132.1647001115145; Fri, 11 Mar 2022 04:18:35 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id t2-20020a2e2d02000000b00244dc8ba5absm1707480ljt.117.2022.03.11.04.18.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 11 Mar 2022 04:18:34 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 14:18:26 +0200 Message-Id: <20220311121830.5653-5-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 5/9] libswresample: 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: cTutaw+j9493 --- fftools/cmdutils.c | 1 + fftools/ffprobe.c | 1 + libswresample/Makefile | 1 + libswresample/swresample.c | 1 + libswresample/swresample.h | 2 +- libswresample/version.h | 3 ++- libswresample/version_major.h | 31 +++++++++++++++++++++++++++++++ 7 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 libswresample/version_major.h diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index f52015708c..dd5d4f5849 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -38,6 +38,7 @@ #include "libavdevice/version.h" #include "libswscale/swscale.h" #include "libswresample/swresample.h" +#include "libswresample/version.h" #include "libpostproc/postprocess.h" #include "libpostproc/version.h" #include "libavutil/attributes.h" diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 203f062935..7d8ab0392e 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -56,6 +56,7 @@ #include "libavdevice/version.h" #include "libswscale/swscale.h" #include "libswresample/swresample.h" +#include "libswresample/version.h" #include "libpostproc/postprocess.h" #include "libpostproc/version.h" #include "cmdutils.h" diff --git a/libswresample/Makefile b/libswresample/Makefile index f528427f55..b74ee20987 100644 --- a/libswresample/Makefile +++ b/libswresample/Makefile @@ -4,6 +4,7 @@ FFLIBS = avutil HEADERS = swresample.h \ version.h \ + version_major.h \ OBJS = audioconvert.o \ dither.o \ diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 16734c9df9..82e979c4c9 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -24,6 +24,7 @@ #include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/internal.h" +#include "version.h" #include diff --git a/libswresample/swresample.h b/libswresample/swresample.h index c7b84fbcac..aebdbafcfc 100644 --- a/libswresample/swresample.h +++ b/libswresample/swresample.h @@ -124,7 +124,7 @@ #include "libavutil/frame.h" #include "libavutil/samplefmt.h" -#include "libswresample/version.h" +#include "libswresample/version_major.h" /** * @name Option constants diff --git a/libswresample/version.h b/libswresample/version.h index 61d0057cf5..9a514e6d6f 100644 --- a/libswresample/version.h +++ b/libswresample/version.h @@ -28,7 +28,8 @@ #include "libavutil/version.h" -#define LIBSWRESAMPLE_VERSION_MAJOR 4 +#include "version_major.h" + #define LIBSWRESAMPLE_VERSION_MINOR 4 #define LIBSWRESAMPLE_VERSION_MICRO 100 diff --git a/libswresample/version_major.h b/libswresample/version_major.h new file mode 100644 index 0000000000..7f265c2073 --- /dev/null +++ b/libswresample/version_major.h @@ -0,0 +1,31 @@ +/* + * Version macros. + * + * This file is part of libswresample + * + * libswresample 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. + * + * libswresample 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 libswresample; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef SWRESAMPLE_VERSION_MAJOR_H +#define SWRESAMPLE_VERSION_MAJOR_H + +/** + * @file + * Libswresample version macros + */ + +#define LIBSWRESAMPLE_VERSION_MAJOR 4 + +#endif /* SWRESAMPLE_VERSION_MAJOR_H */ From patchwork Fri Mar 11 12:18:27 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: 34690 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1638477nkb; Fri, 11 Mar 2022 04:19:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwUiUlAHqaZUXs3TZ4zkY5ttTn/1WQA/jtIcgFn0Bv7huxqBDIuxtt5riTkj7nytJ+VORjw X-Received: by 2002:aa7:d648:0:b0:416:4b85:da68 with SMTP id v8-20020aa7d648000000b004164b85da68mr8329723edr.253.1647001175712; Fri, 11 Mar 2022 04:19:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647001175; cv=none; d=google.com; s=arc-20160816; b=oQ+mwIF20tXDvaWbW+0iDXtY4d/yqjFBrnCiIEOPa73aG6SLxm0j95amw38sP0iwtE inBAo+U1kMAoAiyassVhnbV6W6SybOFhSe2PPHES2J8cMcSn3WYhdQvIHI/ccaRCEib7 567tK0xLV8sD4Dvi5fkt1QaoXDrHRtbm+JE5AJiz4VHaRWS1JX/UqkAeftk33b0in6mD +Wq3ZV9CZUXZ8dHhOfTEsWKhqM/LxnNmwt7rstSHsHHdBdzvBbrmbWXn5mnnyy89Y7ZO VmycAsTkdSW1LgaFkX31iJULiloRG/t9QUm3Rs8i3vFRUuWUoMwhKJipqr7dGzxn/Cze Je9Q== 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=RePquIBeDUCqu9cJv1Q8s13Q+vLq7AA0+bUf2FMo0Hk=; b=w3BKvuxRZjMoDfT5XhIqxiswFI1WUXuAJEQ8NnQ0UCp1ghN/gEO6GwIOlmyluwc3vN sbLvQrEs5sgMbSKPsWc1/9KuWnGtgDQLiUL6ojO1oE1f8qXXOihlbwN9jrjkgTH93StX eIIZT6iBP2PcG5JEAcqFRg5mCdzSY1NYovXpzk0ajESRftafogSN/YWOSkWpnIfm76Gc w+ZJqPMkfqYPkJYazKlZCs8OhjBPaSXIHmFXTlmge+Ysz7JCsC64LOJj7h7MMbXi/kg7 QEjH1OOvCUo+xR59nvEHGFTe9POGCbZyQH9G0uN28sRwB8YftmgoCN7Pzmo0jU0Z8xq2 D/qQ== 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=AiqJsdMA; 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 sb6-20020a1709076d8600b006da84362433si5751430ejc.843.2022.03.11.04.19.35; Fri, 11 Mar 2022 04:19:35 -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=AiqJsdMA; 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 5DC5C68B20E; Fri, 11 Mar 2022 14:18:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF05168B1DF for ; Fri, 11 Mar 2022 14:18:36 +0200 (EET) Received: by mail-lf1-f49.google.com with SMTP id z11so14661552lfh.13 for ; Fri, 11 Mar 2022 04:18:36 -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=RtI7BY7DHl2HQ6+5hSm9hssXWW8d3l5xF2o0EDzwYyk=; b=AiqJsdMAyBuRZX8C55lIJYIosVF1GhnxUs2lwI0rCKfCujjCNkt+tXXT4xpfRViWN2 mUOtfWXfXNWvg98rPcQ5JAuZcWS7wBxu8CrV4Q4xkV3X+5TDnTDXEVetXhkq6BoX3Ddj q1E+9xzg+4AcQx4YBs2jWIqXtCrxknfijjMHu5BJ2YwIHZ2XD+LSK8+Dub7UrVZADUiR YV9Az9NojI6uQhVhuK8xAVxzBdt0nrsHJJgZ76OwY84E5EhAaBgIN02oM/WUah61W4f2 +Koc4ilLoWaKMl5G6dubrr0cIgBulaGcSyTdj9sdZhvrPkIms4WQP50g4K15QbMO6kcu 08kg== 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=RtI7BY7DHl2HQ6+5hSm9hssXWW8d3l5xF2o0EDzwYyk=; b=yqbmA3wIkjVz170DrQY71Uana0BeVBu/KZhKXjAumrwm4c7I6P54l7TSWq+12UbsCr ph+lEfo52d4JZsrziJA3MAoiN5Ya+wNduzKA/nDlHA3Ger7jvEnQAJeBYDk0jBY52Rte ok0v4TkEV9hFTbcxKodbT7yEZcLmuo0QyOSJ+Kg2RhMp1v4XN5PY/3SHr1tRhNOgTS86 mDLPx9kcI7bPrKWBMgy07n7Zt9OclFqefOl2kV1c8QnT0JWqcdxrvI/Gu642pzf2SzjK rta2rxzIMjHJxwrJgE+bR32hN/uvkiYmfgsVGPjLMwGxdEkqXEM3Ilc1BjY8QsC9xxTJ jkLw== X-Gm-Message-State: AOAM530E/hCrgtuorKakBxE69C0w01GUP8zMPNWXjUOF+FCNmGS1Hvj2 XqkcFocdo2v7tsmKYOeac01ZKgBhHCQcBZxs X-Received: by 2002:a05:6512:2347:b0:448:309d:2b19 with SMTP id p7-20020a056512234700b00448309d2b19mr5863968lfu.222.1647001115966; Fri, 11 Mar 2022 04:18:35 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id j11-20020a056512108b00b004486eef2a63sm456141lfg.194.2022.03.11.04.18.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 11 Mar 2022 04:18:35 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 14:18:27 +0200 Message-Id: <20220311121830.5653-6-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 6/9] libswscale: 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: DPWj1rAhMvaL --- fftools/cmdutils.c | 1 + fftools/ffprobe.c | 1 + libswscale/Makefile | 1 + libswscale/swscale.h | 2 +- libswscale/utils.c | 1 + libswscale/version.h | 9 ++------- libswscale/version_major.h | 35 +++++++++++++++++++++++++++++++++++ 7 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 libswscale/version_major.h diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index dd5d4f5849..d5cadec695 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -37,6 +37,7 @@ #include "libavdevice/avdevice.h" #include "libavdevice/version.h" #include "libswscale/swscale.h" +#include "libswscale/version.h" #include "libswresample/swresample.h" #include "libswresample/version.h" #include "libpostproc/postprocess.h" diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 7d8ab0392e..f36397a6ff 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -55,6 +55,7 @@ #include "libavdevice/avdevice.h" #include "libavdevice/version.h" #include "libswscale/swscale.h" +#include "libswscale/version.h" #include "libswresample/swresample.h" #include "libswresample/version.h" #include "libpostproc/postprocess.h" diff --git a/libswscale/Makefile b/libswscale/Makefile index a0ec71e06f..1f02b56421 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -3,6 +3,7 @@ DESC = FFmpeg image rescaling library HEADERS = swscale.h \ version.h \ + version_major.h \ OBJS = alphablend.o \ hscale.o \ diff --git a/libswscale/swscale.h b/libswscale/swscale.h index daa53dc01e..07c69e1ae7 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -33,7 +33,7 @@ #include "libavutil/frame.h" #include "libavutil/log.h" #include "libavutil/pixfmt.h" -#include "version.h" +#include "version_major.h" /** * @defgroup libsws libswscale diff --git a/libswscale/utils.c b/libswscale/utils.c index 34f7f0b869..e86c151f67 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -59,6 +59,7 @@ #include "rgb2rgb.h" #include "swscale.h" #include "swscale_internal.h" +#include "version.h" static SwsVector *sws_getIdentityVec(void); static void sws_addVec(SwsVector *a, SwsVector *b); diff --git a/libswscale/version.h b/libswscale/version.h index 0e5583aa47..c13db31c43 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -26,7 +26,8 @@ #include "libavutil/version.h" -#define LIBSWSCALE_VERSION_MAJOR 6 +#include "version_major.h" + #define LIBSWSCALE_VERSION_MINOR 5 #define LIBSWSCALE_VERSION_MICRO 100 @@ -40,10 +41,4 @@ #define LIBSWSCALE_IDENT "SwS" AV_STRINGIFY(LIBSWSCALE_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. - */ - #endif /* SWSCALE_VERSION_H */ diff --git a/libswscale/version_major.h b/libswscale/version_major.h new file mode 100644 index 0000000000..2f8418780c --- /dev/null +++ b/libswscale/version_major.h @@ -0,0 +1,35 @@ +/* + * 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 SWSCALE_VERSION_MAJOR_H +#define SWSCALE_VERSION_MAJOR_H + +/** + * @file + * swscale version macros + */ + +#define LIBSWSCALE_VERSION_MAJOR 6 + +/** + * 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. + */ + +#endif /* SWSCALE_VERSION_MAJOR_H */ From patchwork Fri Mar 11 12:18:28 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: 34698 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1638577nkb; Fri, 11 Mar 2022 04:19:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJx+9idZpyAtQ1x4QUXwMoraSqaYFITnL3cdj6SQQdnvk8X6TTq9Dku44lAfjzio3YYz5Y+O X-Received: by 2002:a05:6402:2550:b0:416:997f:1239 with SMTP id l16-20020a056402255000b00416997f1239mr8687291edb.141.1647001185824; Fri, 11 Mar 2022 04:19:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647001185; cv=none; d=google.com; s=arc-20160816; b=H3cDWECDHEBD4Lbg2hbJZSABs6K1JRJUFBwWHFxLsGjSOqNP9DaRTMeGoPhSh+AFy+ UdxttYAS8XTDwQoPhVgadvNVSjhHbHXwYWiYQz0fgtZmb29skXfG5H0ALoiMQtUZOK/F cLPGTaNEdqWNfNzlJw66KBZ0F305LelOmxf+7MC+l7XXZQ42eghmIE41q4rcQKBWOW5e Qtp0NTV/eGTxZGof2H7gvXKtFBD1VsFreIAHO0uD9viNHLZjfOpeI3Ttfu+us37xYgS9 pXQC+gfTAGJDlngT+pOqd3xb9LuFxo8+dpE1e3EBAqg2Po2g1lRNccPA3UetdsITZN5E k+Dw== 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=z0KwQWdKh/LtuiERByd/d7wlxRhcdiVcSW/PhI2SsqY=; b=FdI7bTlWyQlOPi+snKQN225ZfH1moQ51k8LJ3VeBYs7HZYJHEphtmnQDD3mBlZi4B0 D2TpeKlAVjvP1hq28wNbKwdTQhQF9wGCQksm8josoRwkai15pdLRyVYpFQT9hAQIAeB4 krHph9RmzmuLQOgiwLkU+y19RD0xBI+x7drPIsUVhznzQZq7DKsE7S/0aAJBa2mVLvWI TIVLNABtKxJg8fGa8/xKZqxPnAHAg/11AX0X83RbhGP9E+PTe8RECDrRijLbEsjecOdO fzGagjLoJ76+ctNCyd5iVpsW2U0/zkr8edoVJbAD1vvvr45PnVI5jF8npadgRBRPbpxw 8JWw== 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="Xl7/eAMj"; 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 gs42-20020a1709072d2a00b006db29be3d32si5340966ejc.38.2022.03.11.04.19.45; Fri, 11 Mar 2022 04:19:45 -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="Xl7/eAMj"; 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 6B48568B1F1; Fri, 11 Mar 2022 14:18:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95E5968B1DF for ; Fri, 11 Mar 2022 14:18:37 +0200 (EET) Received: by mail-lf1-f46.google.com with SMTP id 3so14721938lfr.7 for ; Fri, 11 Mar 2022 04:18:37 -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=xGxCz9HpOQbRd1VjLTkAKPBXxBGy8lSsL15hlcwEoAk=; b=Xl7/eAMjczx70gJgBRuCxrFlI5Z35nlBSw5zgL6WvImzDNo5Guqw42FRT4rAdOjuwX 3HgWm1t26gQcftiwpAyq11r9hdI8euyC0Cd4dMlrNWjlqCVaQPOBN6j/FZX5GkhjDtD0 Tpt343OV1iRFX4oX8YAKcDsL41fsMB9hmrwNZRCrlymNSffcfG++UN6iFMlD2FL+G2Lb oPCTnWhk1XKmmYX5m3cVUyY9x0G3zC5FQTGmuCd9gBXjyRqs4NFaazI+TisFaTkHvlTA 8qJkMWdWuLMFksIkh0GRjNvEnb8TegyXAIfIPSLfEkcwq5KzH7W6MkuQ0+lpH2MnZA2A vyeQ== 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=xGxCz9HpOQbRd1VjLTkAKPBXxBGy8lSsL15hlcwEoAk=; b=FMszuFHFl/zpZFiXxuu9cQvOlAYdCr6nJHVrtsHtPX/yhARsCdawGMn3q6JnAGdJeC aO78E7bqvV1gFPTpR/Fk+WLP9C44gefwsO+F1XHPz9hwAesPmYGyj0aUNPiJAVSoVhP6 aL/PZOcuu/xVnzSqoJtMOvqNx9abm0XzJH1+QIPuKzRzN6+jifsjjVIpKiR0u01UuqZo F1sxrSd1aliEkNmCOPpcez7rQAnOeA7gcRyuJe0GyFGDM5nedgXbx7kTV8Ntz8PKhiO0 1YQisZP6d6MbsgJsgbzUzYg55e6pOq67twyXtXl7i6a/jfYfmQUuihUxFV5VPndCFtkU r7wQ== X-Gm-Message-State: AOAM530kxP2e3gthK+u+SBQcUWC0kS5n2ukcrsVLNaqi/WCaaD1JIRKS 7h1NcmWtJQ3vJfsV3OzpJyfP6jYSg0Rx5fC8 X-Received: by 2002:ac2:41cf:0:b0:448:1eaa:296c with SMTP id d15-20020ac241cf000000b004481eaa296cmr5852472lfi.52.1647001116855; Fri, 11 Mar 2022 04:18:36 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id u2-20020ac24c22000000b004480054f52bsm1581148lfq.45.2022.03.11.04.18.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 11 Mar 2022 04:18:36 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 14:18:28 +0200 Message-Id: <20220311121830.5653-7-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 7/9] libavfilter: 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: UHDbNpM8GKfQ --- fftools/cmdutils.c | 1 + fftools/ffprobe.c | 1 + libavfilter/Makefile | 1 + libavfilter/avfilter.c | 1 + libavfilter/avfilter.h | 2 +- libavfilter/version.h | 13 ++---------- libavfilter/version_major.h | 42 +++++++++++++++++++++++++++++++++++++ 7 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 libavfilter/version_major.h diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index d5cadec695..9cceb68412 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -34,6 +34,7 @@ #include "libavformat/avformat.h" #include "libavformat/version.h" #include "libavfilter/avfilter.h" +#include "libavfilter/version.h" #include "libavdevice/avdevice.h" #include "libavdevice/version.h" #include "libswscale/swscale.h" diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index f36397a6ff..48c39d2540 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -60,6 +60,7 @@ #include "libswresample/version.h" #include "libpostproc/postprocess.h" #include "libpostproc/version.h" +#include "libavfilter/version.h" #include "cmdutils.h" #include "libavutil/thread.h" diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 56d33e6480..d5fc27a575 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -5,6 +5,7 @@ HEADERS = avfilter.h \ buffersink.h \ buffersrc.h \ version.h \ + version_major.h \ OBJS = allfilters.o \ audio.o \ diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 1f37a70179..859c5b837b 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -43,6 +43,7 @@ #include "formats.h" #include "framepool.h" #include "internal.h" +#include "version.h" #include "libavutil/ffversion.h" const char av_filter_ffversion[] = "FFmpeg version " FFMPEG_VERSION; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index b105dc3159..37effcf5cd 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -47,7 +47,7 @@ #include "libavutil/pixfmt.h" #include "libavutil/rational.h" -#include "libavfilter/version.h" +#include "libavfilter/version_major.h" /** * Return the LIBAVFILTER_VERSION_INT constant. diff --git a/libavfilter/version.h b/libavfilter/version.h index 9a890c014f..40fa8d9c47 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -29,7 +29,8 @@ #include "libavutil/version.h" -#define LIBAVFILTER_VERSION_MAJOR 8 +#include "version_major.h" + #define LIBAVFILTER_VERSION_MINOR 27 #define LIBAVFILTER_VERSION_MICRO 100 @@ -44,14 +45,4 @@ #define LIBAVFILTER_IDENT "Lavfi" AV_STRINGIFY(LIBAVFILTER_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_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 9) -#define FF_API_BUFFERSINK_ALLOC (LIBAVFILTER_VERSION_MAJOR < 9) -#define FF_API_PAD_COUNT (LIBAVFILTER_VERSION_MAJOR < 9) - #endif /* AVFILTER_VERSION_H */ diff --git a/libavfilter/version_major.h b/libavfilter/version_major.h new file mode 100644 index 0000000000..de0cf6e979 --- /dev/null +++ b/libavfilter/version_major.h @@ -0,0 +1,42 @@ +/* + * 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 AVFILTER_VERSION_MAJOR_H +#define AVFILTER_VERSION_MAJOR_H + +/** + * @file + * @ingroup lavfi + * Libavfilter version macros + */ + +#define LIBAVFILTER_VERSION_MAJOR 8 + +/** + * 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_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 9) +#define FF_API_BUFFERSINK_ALLOC (LIBAVFILTER_VERSION_MAJOR < 9) +#define FF_API_PAD_COUNT (LIBAVFILTER_VERSION_MAJOR < 9) + +#endif /* AVFILTER_VERSION_MAJOR_H */ From patchwork Fri Mar 11 12:18:29 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: 34699 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1638711nkb; Fri, 11 Mar 2022 04:19:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJyvTjdN9ZYNwFLXpMYKyCuyRT3modyFQUvlwvUcPfbSsrIR5gKNCmXG0AY3DZ5D0mH+UU1i X-Received: by 2002:a17:907:7f9f:b0:6db:720b:1232 with SMTP id qk31-20020a1709077f9f00b006db720b1232mr8500088ejc.355.1647001196073; Fri, 11 Mar 2022 04:19:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647001196; cv=none; d=google.com; s=arc-20160816; b=HhvRCNjYUz5qxmh6YVHVFunaXDEonKOPU0ME4zVjCo9KaEfgNtc+L5Q3nrQszRYKGc ocFjiO97YCCh2BE5m7Kirm3A4juy5vUgKQFCwrct9YM6lT9Kl3hAQOPRFS/1+MbIFOvv 8sMyiAdapB14iIZ6dQHtiVCvO6Fo2BNPADc9uwP7Rc3BbEApynV6kEH31Y+q6Q0y+bTm jm2vHk5ter4tli+FCDqDw74BYmhegfvw9znOD1ZHUicWmlofED9inwxhLQHXly6M4yQJ u3Ifr8E8YtI6PoE6iFPe9zPrDNKxSIfD56vhKJv6S0SMZc1ukyTYGdtBXc5Rtdd429yb mEVg== 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=zvisNA4TS7z6KObGoLrcFJx+6vaI7fX6630nmPdBecU=; b=IqJeAgdj7+AiHWj20aWebCGwjepOL+i6KBLHHlruhGBnqPMkaH3KFy3rzpgIYt6SLp xM+C+t7ZBV1ogkvo4VVZdRBoq5w+B4jmcHS0giYdeaKmH2sf7ZUdn9N29GqKWqe+yhky AnOfKaPfoZSOnvSkQtAIXs5oKK2xgpwCkSUOHuVJMDMSSi51sSrWF8fqoAv9mSdMCbFJ Pd0DiIlfq0zZcuVHkYku+bqySIaReOOjfmRoZ20fXWISArI/LaoZY7r1TzTe3XruEaPg beHif0e+0Jy+ku/OzVgegVNKqcgEYFFVgIkfeF0vyYzavQyCrHqMuSwZOq1onf2UYOKe gtcw== 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=bn5AvgYS; 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 he17-20020a1709073d9100b006daa8fcdfe3si5111216ejc.508.2022.03.11.04.19.55; Fri, 11 Mar 2022 04:19:56 -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=bn5AvgYS; 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 5A43B68B24E; Fri, 11 Mar 2022 14:18:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48F6B68B1F4 for ; Fri, 11 Mar 2022 14:18:38 +0200 (EET) Received: by mail-lf1-f46.google.com with SMTP id b28so3052094lfc.4 for ; Fri, 11 Mar 2022 04:18:38 -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=dzXjlFE7DASxGbm9n+hmA9UPDkKjiGkq5feiMIfx+XE=; b=bn5AvgYSy/myev0AJnR9GXZv+NNThY2Y+v+qaY5n9qvE78Mo7xa1jiS+lQXKAoLRcF MW+JKjJtXBQTGQxT8DMliJpsdMKQ2aIJvtM2GMGQsDL3CGzKTRAG+Kc1l9RQShDP3S+1 eihUg41wYqRdlFQKQ/5EyUmhcGMDdKFdL8wdAtKXuWJ6bszbxwR77BCFNjBiffAtZSHB G5axYb4+SwfoVvJia5OOf6vnkgI4mbTdp5E+bajVHBMhBrdHGe2IbncFCqGEVxMERceb gQOwH5RsYh9+irCodvnYAp17V6Utc9MM40mKymhMbdoDyOiufWBUIDiaJ8yE7oIND8Ig LGnQ== 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=dzXjlFE7DASxGbm9n+hmA9UPDkKjiGkq5feiMIfx+XE=; b=np1lbUi00Ht5tZXbeV7tip9MqVQ1g4TEye2KFiuofnkoImbperPdP/k4N37kbydDGu Uy+UqtSqXpIk4rygcw+Th7fNtWBAj32a43XbPlHvyNb09y0ElPiKGOt3ZBKKHcHmcFqg /GWwJv45BA2co0rKsTNolUQJvm69uqtVZmrWeLlWKwieImlxZV+gSf1w1xGsk5xAt3r+ qp7PBLiGR1xmaYYi1P455NZlUvx8WTZHd6RcrVLDiZCoWH2hjYhx0bc+2sl4ld1pSp/S q4WO1R8wu0FPSGXX86pI9z/+GTBFyVVGSX7YGQbuuU7vzELdb/Sx6ZL0Kx74IFZT/4td lOqg== X-Gm-Message-State: AOAM531Z03SQ0QP4deDXDCIaUkibk1YpUv5j291N7ktlmhKqY5etReON Q9wUvjZlLHTybmKH3UmX+QjGKBQt4PxYfZWl X-Received: by 2002:ac2:42c3:0:b0:448:2d33:f8d9 with SMTP id n3-20020ac242c3000000b004482d33f8d9mr5953626lfl.194.1647001117667; Fri, 11 Mar 2022 04:18:37 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id f9-20020a2e3809000000b002491885098dsm601103lja.74.2022.03.11.04.18.37 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 11 Mar 2022 04:18:37 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 14:18:29 +0200 Message-Id: <20220311121830.5653-8-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 8/9] doc: Add an entry to APIchanges about no longer implicitly including 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: DIGk7g4dJ121 --- doc/APIchanges | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index ccc4f24b28..365a9747c9 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,12 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-*-* - xxxxxxxxxx - all libraries + No longer implicitly include lib/version.h in lib/.h. + Users who depend on defines from these files (LIB_VERSION*, + LIB_IDENT) must explicitly include these headers instead of + relying on them being included implicitly. + 2022-03-10 - xxxxxxxxxx - lavu 57.23.100 - cpu.h Add AV_CPU_FLAG_AVX512ICL. From patchwork Fri Mar 11 12:18:30 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: 34697 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1641811nkb; Fri, 11 Mar 2022 04:24:12 -0800 (PST) X-Received: by 2002:a17:906:a0ce:b0:6d1:cb30:3b3b with SMTP id bh14-20020a170906a0ce00b006d1cb303b3bmr8311241ejb.582.1647001211741; Fri, 11 Mar 2022 04:20:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJxTIcfIbKndXga0omUONBOEp5W1d3BsF8na/HkHn/Gt31tnS1PL+nZ1xnDETC088vHRSroY X-Received: by 2002:a17:906:a0ce:b0:6d1:cb30:3b3b with SMTP id bh14-20020a170906a0ce00b006d1cb303b3bmr8310949ejb.582.1647001207709; Fri, 11 Mar 2022 04:20:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647001207; cv=none; d=google.com; s=arc-20160816; b=osyvOObKNFeye40GvuSx/sAcV9JnNWuI0xSsh3/ZTH7IqCwnFsKqc7jmOs6jBfW5um VMiUqnukPSJOuHA8cbvp0MslDTJt2DgC5/2t6RUGZ0eonI8Dg9jAK3fM1hskIf8U+kiO tjUT1gyRUcHROU3QaH8SeQac/PZ9DhnzdVnejg3lKapQ8s4aoSzQBd97mnT0Nnyg6R83 e3te8rpaAfPPWVdyq5+3MMggBtGhhViCzruM0EQucJkqj1kWIdb2eK5uQyOysOXJfgtw sR9NkPaB23VQORg0C1i1Lt/UL+grcOKcX552p6D9pq3V+fp9SNgNnnS2Qzvg3Z/ffUkN JRXA== 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=cOfsF167g+Xu8M1ZnskskIBQ/rvCizVpp7+xd7ZJ64g=; b=dP2pDVW10F4mWq1V8qA3+fjOgRCHuvLbTaFVdYHQLBaJgA8wxBUrDuqDmZmeFj8iNl FOAMfR5e0Alc2nv7naGWrB2+wA2mYohjnYUCNfrvwThYDvjS6x8g6tj4hUTLZ5klqKzQ 9h1/vggMmZi3yMSz+5AgEv5NPgJVpHyDPq4AConz4/qlMt1iEhnQy/7nB1qaYVKwznVQ Pktw4+J6+mYGBmNQUFuT3fSDjBWIxj+hovc6V+FwfX+AXLTyH01jhCUqpG92fx/7Jw5k 0blIfaHBmuZCGkHQ9+qh8EZaxlwvW2CDsqEoJFqw/1OCdOgOWuKwgyVzvWfAVbDuwmhB Yezw== 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="aP/Id+i1"; 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 v5-20020aa7dbc5000000b00412e5aa522bsi4717739edt.434.2022.03.11.04.20.06; Fri, 11 Mar 2022 04:20:07 -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="aP/Id+i1"; 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 1EAF368B266; Fri, 11 Mar 2022 14:18:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C32CC68B214 for ; Fri, 11 Mar 2022 14:18:39 +0200 (EET) Received: by mail-lf1-f53.google.com with SMTP id bu29so14841883lfb.0 for ; Fri, 11 Mar 2022 04:18:39 -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=x68mQc7lvty3nK8R2WXGpPF3mf3RNlRy1mhrQPvZ7Cg=; b=aP/Id+i1HbrbUP2ZIk4KAkkBbUsEQCBdQ9ut+YdZZ99M0LZw3BHW7efEaP+efChhUL lQTt/FtJhj2VrNxCTjn5uzgN53tgJipzDrcC4pRmFdCoDTGie+pvnTa/iunRkUOr0vjf 8R6TUHzsD1eaGwogoZKVU0KifTNcadEx+eoO8yBMSG3ynUVpPvbLTx3I2LYXyOc6vwEi KjGc6rbOxQlTIlhtMquxr+XIHVQ7Pdq/huK4/s5r3COKUWgSBV3hCzGpiE9ponTMGBra GQ9+C6IIjey8PKpgG6nDLylupRQiW8sx/b56i3Neyl9ZmstsZghHETUwLEOigRmtsN22 cuFw== 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=x68mQc7lvty3nK8R2WXGpPF3mf3RNlRy1mhrQPvZ7Cg=; b=pZt6qQ8MTk9Jh1/QllTYVP0MXU7lp2gyeNPrSEQjjNw4OOxyPOWncFlRDq3LHHGYHf VCr+QiTsA2n+ECLoJ8cjYhKfr59LhZFzefTpkm9sJDUyW4CHNboEv80n4rNIcdc+uxye dTaS6U1VBxuNrvl/1f53C9hZs8biW0M/FLJAL6rwgm72ggbHfHWEp2plzxsml4QzBPdI A9u0N0fvyNHY1dazMD81br5FHCF/j0uDuSYwZjZxlXhzfKOipemC6nG3BBE3iXRyCK9/ POCJN7kRowdXqtOWBxjoa2xtGGnSTMOHtC0wtyJ9s5B6LjB4iQz2BALo3ZH6VhG+BNJd 6HYg== X-Gm-Message-State: AOAM530svV6dge/5yiiZLsEG5vWHOv0RX3Ot+aELO08vwHnR7bjol8Jo 4JAiaYfNRbfO8G/3l/9sE21aTHsLOBqq2PKU X-Received: by 2002:a19:5219:0:b0:448:2fcc:aa75 with SMTP id m25-20020a195219000000b004482fccaa75mr5948713lfb.280.1647001118544; Fri, 11 Mar 2022 04:18:38 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id h12-20020a0565123c8c00b0044826d6ba04sm1583544lfv.208.2022.03.11.04.18.38 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 11 Mar 2022 04:18:38 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 14:18:30 +0200 Message-Id: <20220311121830.5653-9-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 9/9] configure: Use a separate config_components.h header for $ALL_COMPONENTS 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: /LK4crxelLO9 This avoids unnecessary rebuilds of most source files if only the list of enabled components has changed, but not the other properties of the build, set in config.h. --- configure | 17 +++++++++++++++-- fftools/ffplay.c | 1 + libavcodec/8svx.c | 2 ++ libavcodec/a64multienc.c | 2 ++ libavcodec/aac_ac3_parser.c | 2 ++ libavcodec/aactab.c | 1 + libavcodec/aarch64/h264cmc_neon.S | 2 ++ libavcodec/ac3_parser.c | 1 + libavcodec/ac3dec.c | 2 ++ libavcodec/ac3enc.c | 1 + libavcodec/ac3enc_template.c | 2 ++ libavcodec/adpcm.c | 3 +++ libavcodec/adpcmenc.c | 2 ++ libavcodec/allcodecs.c | 1 + libavcodec/aptxdec.c | 2 ++ libavcodec/aptxenc.c | 2 ++ libavcodec/arm/flacdsp_init_arm.c | 1 + libavcodec/arm/h264cmc_neon.S | 2 ++ libavcodec/assdec.c | 1 + libavcodec/assenc.c | 2 ++ libavcodec/asvdec.c | 1 + libavcodec/asvenc.c | 2 ++ libavcodec/audiotoolboxdec.c | 1 + libavcodec/av1dec.c | 2 ++ libavcodec/binkaudio.c | 2 ++ libavcodec/bintext.c | 2 ++ libavcodec/bsf.c | 1 + libavcodec/cyuv.c | 2 ++ libavcodec/dxva2_av1.c | 2 ++ libavcodec/dxva2_h264.c | 2 ++ libavcodec/dxva2_hevc.c | 2 ++ libavcodec/dxva2_mpeg2.c | 2 ++ libavcodec/dxva2_vc1.c | 2 ++ libavcodec/dxva2_vp9.c | 2 ++ libavcodec/flashsv.c | 2 ++ libavcodec/g726.c | 3 +++ libavcodec/gsmdec.c | 2 ++ libavcodec/h263dec.c | 2 ++ libavcodec/h264_slice.c | 2 ++ libavcodec/h264dec.c | 2 ++ libavcodec/hevcdec.c | 2 ++ libavcodec/huffyuvdec.c | 2 ++ libavcodec/huffyuvenc.c | 2 ++ libavcodec/idctdsp.c | 1 + libavcodec/iff.c | 2 ++ libavcodec/imc.c | 1 + libavcodec/ituh263dec.c | 2 ++ libavcodec/ituh263enc.c | 2 ++ libavcodec/lcldec.c | 2 ++ libavcodec/libgsmdec.c | 1 + libavcodec/libgsmenc.c | 1 + libavcodec/libopencore-amr.c | 2 ++ libavcodec/libvpx.c | 1 + libavcodec/libvpxdec.c | 2 ++ libavcodec/libvpxenc.c | 2 ++ libavcodec/libx264.c | 2 ++ libavcodec/me_cmp.c | 1 + libavcodec/metasound_data.c | 1 + libavcodec/mjpegdec.c | 2 ++ libavcodec/mjpegenc.c | 2 ++ libavcodec/mlpdec.c | 2 ++ libavcodec/mlpenc.c | 2 ++ libavcodec/mpeg12dec.c | 2 ++ libavcodec/mpeg12enc.c | 1 + libavcodec/mpeg4videodec.c | 2 ++ libavcodec/mpegaudiodec_fixed.c | 1 + libavcodec/mpegaudiodec_float.c | 1 + libavcodec/mpegvideo.c | 2 ++ libavcodec/mpegvideo_enc.c | 2 ++ libavcodec/mpegvideo_motion.c | 2 ++ libavcodec/msmpeg4.c | 2 ++ libavcodec/msmpeg4dec.c | 2 ++ libavcodec/mvcdec.c | 2 ++ libavcodec/options.c | 2 ++ libavcodec/opus_pvq.c | 2 ++ libavcodec/pcm.c | 1 + libavcodec/pngdec.c | 2 ++ libavcodec/pnmdec.c | 2 ++ libavcodec/pnmenc.c | 2 ++ libavcodec/proresdec2.c | 2 ++ libavcodec/qpeldsp.c | 1 + libavcodec/r210dec.c | 1 + libavcodec/r210enc.c | 2 ++ libavcodec/rv34_parser.c | 2 ++ libavcodec/sonic.c | 3 +++ libavcodec/sp5xdec.c | 2 ++ libavcodec/speedhq.c | 1 + libavcodec/speedhqenc.c | 2 ++ libavcodec/srtdec.c | 2 ++ libavcodec/srtenc.c | 2 ++ libavcodec/textdec.c | 2 ++ libavcodec/v408dec.c | 2 ++ libavcodec/v408enc.c | 2 ++ libavcodec/vc1dec.c | 2 ++ libavcodec/vc1dsp.c | 2 ++ libavcodec/videotoolbox.c | 1 + libavcodec/vorbis_parser.c | 2 ++ libavcodec/vp3.c | 2 ++ libavcodec/vp56dsp.c | 1 + libavcodec/vp8.c | 2 ++ libavcodec/vp8dsp.c | 2 ++ libavcodec/vp9.c | 2 ++ libavcodec/wmadec.c | 2 ++ libavcodec/wmaenc.c | 2 ++ libavcodec/x86/flacdsp_init.c | 1 + libavcodec/x86/hpeldsp_init.c | 2 ++ libavfilter/aeval.c | 2 ++ libavfilter/af_afade.c | 2 ++ libavfilter/af_agate.c | 2 ++ libavfilter/af_biquads.c | 2 ++ libavfilter/af_sidechaincompress.c | 2 ++ libavfilter/avf_showspectrum.c | 2 ++ libavfilter/avf_showwaves.c | 2 ++ libavfilter/f_bench.c | 2 ++ libavfilter/f_cue.c | 2 ++ libavfilter/f_drawgraph.c | 2 ++ libavfilter/f_graphmonitor.c | 2 ++ libavfilter/f_interleave.c | 2 ++ libavfilter/f_latency.c | 2 ++ libavfilter/f_loop.c | 2 ++ libavfilter/f_metadata.c | 2 ++ libavfilter/f_perms.c | 2 ++ libavfilter/f_realtime.c | 2 ++ libavfilter/f_reverse.c | 2 ++ libavfilter/f_segment.c | 2 ++ libavfilter/f_select.c | 2 ++ libavfilter/f_sendcmd.c | 2 ++ libavfilter/f_sidedata.c | 2 ++ libavfilter/lut3d.h | 2 ++ libavfilter/setpts.c | 2 ++ libavfilter/settb.c | 2 ++ libavfilter/src_movie.c | 2 ++ libavfilter/trim.c | 1 + libavfilter/vf_aspect.c | 2 ++ libavfilter/vf_blend.c | 2 ++ libavfilter/vf_colorconstancy.c | 2 ++ libavfilter/vf_colorkey.c | 2 ++ libavfilter/vf_convolution.c | 2 ++ libavfilter/vf_convolve.c | 2 ++ libavfilter/vf_drawbox.c | 2 ++ libavfilter/vf_extractplanes.c | 2 ++ libavfilter/vf_format.c | 2 ++ libavfilter/vf_histogram.c | 2 ++ libavfilter/vf_identity.c | 2 ++ libavfilter/vf_lut.c | 2 ++ libavfilter/vf_lut2.c | 2 ++ libavfilter/vf_mix.c | 2 ++ libavfilter/vf_neighbor.c | 2 ++ libavfilter/vf_premultiply.c | 2 ++ libavfilter/vf_setparams.c | 2 ++ libavfilter/vf_stack.c | 2 ++ libavfilter/vf_xmedian.c | 2 ++ libavfilter/vsrc_testsrc.c | 2 ++ libavformat/ac3dec.c | 2 ++ libavformat/alp.c | 2 ++ libavformat/amr.c | 2 ++ libavformat/apm.c | 3 +++ libavformat/aptxdec.c | 2 ++ libavformat/argo_asf.c | 3 +++ libavformat/argo_cvg.c | 2 ++ libavformat/asfenc.c | 2 ++ libavformat/au.c | 2 ++ libavformat/av1dec.c | 1 + libavformat/avidec.c | 2 ++ libavformat/avienc.c | 1 + libavformat/bintext.c | 2 ++ libavformat/bit.c | 3 +++ libavformat/codec2.c | 2 ++ libavformat/concat.c | 2 ++ libavformat/dashenc.c | 1 + libavformat/demux.c | 1 + libavformat/file.c | 2 ++ libavformat/format.c | 2 ++ libavformat/g726.c | 2 ++ libavformat/gopher.c | 1 + libavformat/hashenc.c | 2 ++ libavformat/hls.c | 2 ++ libavformat/hlsenc.c | 1 + libavformat/http.c | 1 + libavformat/ilbc.c | 2 ++ libavformat/img2dec.c | 2 ++ libavformat/img2enc.c | 2 ++ libavformat/kvag.c | 2 ++ libavformat/matroskadec.c | 1 + libavformat/matroskaenc.c | 1 + libavformat/mj2kdec.c | 2 ++ libavformat/mlpdec.c | 2 ++ libavformat/mmf.c | 2 ++ libavformat/mov.c | 2 ++ libavformat/movenc.c | 2 ++ libavformat/mpeg.c | 2 ++ libavformat/mpegenc.c | 2 ++ libavformat/mpegts.c | 2 ++ libavformat/network.c | 2 ++ libavformat/oggenc.c | 2 ++ libavformat/pcmdec.c | 2 ++ libavformat/pcmenc.c | 2 ++ libavformat/rawdec.c | 2 ++ libavformat/rawenc.c | 2 ++ libavformat/rawvideodec.c | 2 ++ libavformat/riff.c | 1 + libavformat/rtmpproto.c | 2 ++ libavformat/rtsp.c | 2 ++ libavformat/rtspdec.c | 2 ++ libavformat/sdp.c | 2 ++ libavformat/segment.c | 2 ++ libavformat/swfenc.c | 2 ++ libavformat/voc.c | 1 + libavformat/wavdec.c | 1 + libavformat/wavenc.c | 2 ++ 210 files changed, 399 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 7d22c2a345..74881682d0 100755 --- a/configure +++ b/configure @@ -7791,17 +7791,30 @@ print_config ARCH_ "$config_files" $ARCH_LIST print_config HAVE_ "$config_files" $HAVE_LIST print_config CONFIG_ "$config_files" $CONFIG_LIST \ $CONFIG_EXTRA \ - $ALL_COMPONENTS \ echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH -echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak # Do not overwrite an unchanged config.h to avoid superfluous rebuilds. cp_if_changed $TMPH config.h touch ffbuild/.config +# Copy config.asm before printing ALL_COMPONENTS; that's not needed in assembly. enabled x86asm && cp_if_changed $TMPASM config.asm +# Reopen a new TMPH for config_components.h. +cat > $TMPH <> $TMPH +echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak + +cp_if_changed $TMPH config_components.h + cat > $TMPH < #include #include diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c index 6ef8cd73fe..760549d54a 100644 --- a/libavcodec/8svx.c +++ b/libavcodec/8svx.c @@ -37,6 +37,8 @@ * http://aminet.net/mods/smpl/ */ +#include "config_components.h" + #include "libavutil/avassert.h" #include "avcodec.h" #include "internal.h" diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c index 7bdf4a61b1..a1e0d711ba 100644 --- a/libavcodec/a64multienc.c +++ b/libavcodec/a64multienc.c @@ -24,6 +24,8 @@ * a64 video encoder - multicolor modes */ +#include "config_components.h" + #include "a64colors.h" #include "a64tables.h" #include "elbg.h" diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index e84d30aea2..a42ce5a0fb 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "parser.h" diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c index 0553f41a61..0f4941d5df 100644 --- a/libavcodec/aactab.c +++ b/libavcodec/aactab.c @@ -28,6 +28,7 @@ */ #include "config.h" +#include "config_components.h" #include "libavutil/mem_internal.h" #include "libavutil/thread.h" #include "aac.h" diff --git a/libavcodec/aarch64/h264cmc_neon.S b/libavcodec/aarch64/h264cmc_neon.S index 8be7578001..f8e9407854 100644 --- a/libavcodec/aarch64/h264cmc_neon.S +++ b/libavcodec/aarch64/h264cmc_neon.S @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/aarch64/asm.S" /* chroma_mc8(uint8_t *dst, uint8_t *src, ptrdiff_t stride, int h, int x, int y) */ diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index f3c7d27d59..86e8d417eb 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "config_components.h" #include "libavutil/channel_layout.h" #include "parser.h" diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index ae00373dcb..9a9f202f27 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -24,6 +24,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include #include #include diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 034aa0beb9..e9b2e5a19c 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -38,6 +38,7 @@ #include "libavutil/opt.h" #include "libavutil/thread.h" #include "avcodec.h" +#include "config_components.h" #include "encode.h" #include "internal.h" #include "me_cmp.h" diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c index 5ecef3b178..fbe1dd1e04 100644 --- a/libavcodec/ac3enc_template.c +++ b/libavcodec/ac3enc_template.c @@ -26,6 +26,8 @@ * AC-3 encoder float/fixed template */ +#include "config_components.h" + #include #include "libavutil/attributes.h" diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index cfde5f58b9..3c2f30b810 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -34,6 +34,9 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "config_components.h" + #include "avcodec.h" #include "get_bits.h" #include "bytestream.h" diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index b0f6f209b7..fa7e6486ae 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/opt.h" #include "avcodec.h" diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 628d27fd75..74049afa8f 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -28,6 +28,7 @@ #include #include "config.h" +#include "config_components.h" #include "libavutil/thread.h" #include "codec.h" #include "codec_id.h" diff --git a/libavcodec/aptxdec.c b/libavcodec/aptxdec.c index bdcc076c41..7f76c28e3b 100644 --- a/libavcodec/aptxdec.c +++ b/libavcodec/aptxdec.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/channel_layout.h" #include "aptx.h" diff --git a/libavcodec/aptxenc.c b/libavcodec/aptxenc.c index 5ea6053c26..8f96dce735 100644 --- a/libavcodec/aptxenc.c +++ b/libavcodec/aptxenc.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/channel_layout.h" #include "aptx.h" #include "encode.h" diff --git a/libavcodec/arm/flacdsp_init_arm.c b/libavcodec/arm/flacdsp_init_arm.c index c4a6e3a535..bac9ff1959 100644 --- a/libavcodec/arm/flacdsp_init_arm.c +++ b/libavcodec/arm/flacdsp_init_arm.c @@ -21,6 +21,7 @@ #include "libavutil/attributes.h" #include "libavcodec/flacdsp.h" #include "config.h" +#include "config_components.h" void ff_flac_lpc_16_arm(int32_t *samples, const int coeffs[32], int order, int qlevel, int len); diff --git a/libavcodec/arm/h264cmc_neon.S b/libavcodec/arm/h264cmc_neon.S index 5a4159eedd..3687b02ede 100644 --- a/libavcodec/arm/h264cmc_neon.S +++ b/libavcodec/arm/h264cmc_neon.S @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/arm/asm.S" /* chroma_mc8(uint8_t *dst, uint8_t *src, ptrdiff_t stride, int h, int x, int y) */ diff --git a/libavcodec/assdec.c b/libavcodec/assdec.c index 319279490c..a9697d045d 100644 --- a/libavcodec/assdec.c +++ b/libavcodec/assdec.c @@ -23,6 +23,7 @@ #include "avcodec.h" #include "ass.h" +#include "config_components.h" #include "internal.h" #include "libavutil/internal.h" #include "libavutil/mem.h" diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c index a6d107ded2..b7a88f9d44 100644 --- a/libavcodec/assenc.c +++ b/libavcodec/assenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include #include "avcodec.h" diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c index 60a4e138c4..36bedb5928 100644 --- a/libavcodec/asvdec.c +++ b/libavcodec/asvdec.c @@ -30,6 +30,7 @@ #include "asv.h" #include "avcodec.h" #include "blockdsp.h" +#include "config_components.h" #include "idctdsp.h" #include "internal.h" #include "mpeg12data.h" diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index ff96338e8a..96700aa9e3 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -23,6 +23,8 @@ * ASUS V1/V2 encoder. */ +#include "config_components.h" + #include "libavutil/attributes.h" #include "libavutil/mem.h" diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index 9939fef218..b7c746ef6f 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -23,6 +23,7 @@ #include #include "config.h" +#include "config_components.h" #include "avcodec.h" #include "ac3_parser_internal.h" #include "bytestream.h" diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index b354d8d03c..87f0ebb3bd 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/film_grain_params.h" #include "libavutil/pixdesc.h" #include "libavutil/opt.h" diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index f808141ba5..31e15a094e 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -28,6 +28,8 @@ * http://wiki.multimedia.cx/index.php?title=Bink_Audio */ +#include "config_components.h" + #include "libavutil/channel_layout.h" #include "libavutil/intfloat.h" #include "libavutil/mem_internal.h" diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c index 553f020738..d9e95a95b4 100644 --- a/libavcodec/bintext.c +++ b/libavcodec/bintext.c @@ -28,6 +28,8 @@ * iCEDraw File decoder */ +#include "config_components.h" + #include "libavutil/intreadwrite.h" #include "libavutil/xga_font_data.h" #include "avcodec.h" diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index 8ba021cb47..60761e6f7d 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -19,6 +19,7 @@ #include #include "config.h" +#include "config_components.h" #include "libavutil/avassert.h" #include "libavutil/log.h" diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index cfaa5cfa66..50aa2322e9 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -28,6 +28,8 @@ * Creative YUV (CYUV) Video Decoder. */ +#include "config_components.h" + #include #include #include diff --git a/libavcodec/dxva2_av1.c b/libavcodec/dxva2_av1.c index 7b4483f855..228f72ba18 100644 --- a/libavcodec/dxva2_av1.c +++ b/libavcodec/dxva2_av1.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avassert.h" #include "libavutil/pixdesc.h" diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index 5b23b28f12..6300b1418d 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avassert.h" #include "dxva2_internal.h" diff --git a/libavcodec/dxva2_hevc.c b/libavcodec/dxva2_hevc.c index dbb701fb1c..c91bcf3eeb 100644 --- a/libavcodec/dxva2_hevc.c +++ b/libavcodec/dxva2_hevc.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avassert.h" #include "dxva2_internal.h" diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c index 136f5f9e06..1989c588dc 100644 --- a/libavcodec/dxva2_mpeg2.c +++ b/libavcodec/dxva2_mpeg2.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/log.h" #include "dxva2_internal.h" diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index 5fd6957d0c..cf660a50d2 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "dxva2_internal.h" #include "mpegutils.h" #include "mpegvideodec.h" diff --git a/libavcodec/dxva2_vp9.c b/libavcodec/dxva2_vp9.c index eaeab3af7a..dbe6c08ad1 100644 --- a/libavcodec/dxva2_vp9.c +++ b/libavcodec/dxva2_vp9.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avassert.h" #include "libavutil/pixdesc.h" diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 00f77f4902..25e431ef68 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -33,6 +33,8 @@ * downloaded from http://www.adobe.com/devnet/swf.html. */ +#include "config_components.h" + #include #include #include diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 2a0148c1d5..3d851970d2 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -21,6 +21,9 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "config_components.h" + #include #include "libavutil/channel_layout.h" diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index c169112311..c0253977af 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -24,6 +24,8 @@ * GSM decoder */ +#include "config_components.h" + #include "libavutil/channel_layout.h" #include "avcodec.h" #include "get_bits.h" diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 423036e97b..399b67d76b 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -27,6 +27,8 @@ #define UNCHECKED_BITSTREAM_READER 1 +#include "config_components.h" + #include "avcodec.h" #include "error_resilience.h" #include "flvdec.h" diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 110a41772a..ee84b3764d 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -25,6 +25,8 @@ * @author Michael Niedermayer */ +#include "config_components.h" + #include "libavutil/avassert.h" #include "libavutil/display.h" #include "libavutil/film_grain_params.h" diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 856fbca680..cc77c3169d 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -27,6 +27,8 @@ #define UNCHECKED_BITSTREAM_READER 1 +#include "config_components.h" + #include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 068750ddb6..4f49d95960 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -23,6 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/attributes.h" #include "libavutil/common.h" #include "libavutil/display.h" diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index a5e0ef5818..8dc7864dd0 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -32,6 +32,8 @@ #define UNCHECKED_BITSTREAM_READER 1 +#include "config_components.h" + #include "avcodec.h" #include "get_bits.h" #include "huffyuv.h" diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 97497a8e75..39a434c720 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -28,6 +28,8 @@ * huffyuv encoder */ +#include "config_components.h" + #include "avcodec.h" #include "encode.h" #include "huffyuv.h" diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c index fbcec8436c..df3aeb0676 100644 --- a/libavcodec/idctdsp.c +++ b/libavcodec/idctdsp.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "config_components.h" #include "libavutil/attributes.h" #include "libavutil/common.h" #include "avcodec.h" diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 1dcf0e00ed..6596130727 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -26,6 +26,8 @@ * IFF ACBM/ANIM/DEEP/ILBM/PBM/RGB8/RGBN bitmap decoder */ +#include "config_components.h" + #include #include "libavutil/imgutils.h" diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 116c273ba0..1d9685313f 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -29,6 +29,7 @@ * Only mono is supported. */ +#include "config_components.h" #include #include diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 0c9473af56..f01c942f04 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -29,6 +29,8 @@ #define UNCHECKED_BITSTREAM_READER 1 +#include "config_components.h" + #include "libavutil/attributes.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 8bedecb36e..dc8dd8c9ea 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -27,6 +27,8 @@ * H.263 bitstream encoder. */ +#include "config_components.h" + #include #include "libavutil/attributes.h" diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index f3b7a8ac1b..b2ef85e5f9 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -37,6 +37,8 @@ * Supports: BGR24 (RGB 24bpp) */ +#include "config_components.h" + #include #include diff --git a/libavcodec/libgsmdec.c b/libavcodec/libgsmdec.c index ae4a952d99..2e6aa037ea 100644 --- a/libavcodec/libgsmdec.c +++ b/libavcodec/libgsmdec.c @@ -28,6 +28,7 @@ // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html #include "config.h" +#include "config_components.h" #if HAVE_GSM_H #include #else diff --git a/libavcodec/libgsmenc.c b/libavcodec/libgsmenc.c index a2f6c1c62e..fab6b0cffb 100644 --- a/libavcodec/libgsmenc.c +++ b/libavcodec/libgsmenc.c @@ -28,6 +28,7 @@ // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html #include "config.h" +#include "config_components.h" #if HAVE_GSM_H #include #else diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index 2df1c5090f..0d7c449175 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include #include "libavutil/avstring.h" diff --git a/libavcodec/libvpx.c b/libavcodec/libvpx.c index cc055a0032..c2b00232d2 100644 --- a/libavcodec/libvpx.c +++ b/libavcodec/libvpx.c @@ -21,6 +21,7 @@ #include #include "libvpx.h" #include "config.h" +#include "config_components.h" #if CONFIG_LIBVPX_VP9_ENCODER #include diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index b2aa205036..f59a03fc2f 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -23,6 +23,8 @@ * VP8/9 decoder support via libvpx */ +#include "config_components.h" + #define VPX_CODEC_DISABLE_COMPAT 1 #include #include diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 8f94ba15dc..77b96a5cde 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -23,6 +23,8 @@ * VP8/9 encoder support via libvpx */ +#include "config_components.h" + #define VPX_DISABLE_CTRL_TYPECHECKS 1 #define VPX_CODEC_DISABLE_COMPAT 1 #include diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index c5e0231b12..b8800db946 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/eval.h" #include "libavutil/internal.h" #include "libavutil/opt.h" diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c index b2f87d2e1b..4c1de44eda 100644 --- a/libavcodec/me_cmp.c +++ b/libavcodec/me_cmp.c @@ -29,6 +29,7 @@ #include "me_cmp.h" #include "mpegvideoenc.h" #include "config.h" +#include "config_components.h" /* (i - 256) * (i - 256) */ const uint32_t ff_square_tab[512] = { diff --git a/libavcodec/metasound_data.c b/libavcodec/metasound_data.c index 22b2730dda..b2044364fa 100644 --- a/libavcodec/metasound_data.c +++ b/libavcodec/metasound_data.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "config_components.h" #include "metasound_data.h" #if CONFIG_METASOUND_DECODER diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 267609d96a..7ff6985bc4 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -30,6 +30,8 @@ * MJPEG decoder. */ +#include "config_components.h" + #include "libavutil/display.h" #include "libavutil/imgutils.h" #include "libavutil/avassert.h" diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 08671b0df7..5290bcf60c 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -30,6 +30,8 @@ * MJPEG encoder. */ +#include "config_components.h" + #include "libavutil/pixdesc.h" #include "avcodec.h" diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 29fac54542..36f2e9c1ae 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -24,6 +24,8 @@ * MLP decoder */ +#include "config_components.h" + #include #include "avcodec.h" diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index d8783b6f56..0552d98d89 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "avcodec.h" #include "encode.h" #include "internal.h" diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 9e4e26aa67..7791dcb5fd 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -25,6 +25,8 @@ * MPEG-1/2 decoder */ +#include "config_components.h" + #define UNCHECKED_BITSTREAM_READER 1 #include diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 03692994b5..6110f117c6 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -28,6 +28,7 @@ #include #include "config.h" +#include "config_components.h" #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/log.h" diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 0e0ebb674b..8fb5ec119e 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -22,6 +22,8 @@ #define UNCHECKED_BITSTREAM_READER 1 +#include "config_components.h" + #include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/thread.h" diff --git a/libavcodec/mpegaudiodec_fixed.c b/libavcodec/mpegaudiodec_fixed.c index f9f24330fd..ac0b1f3bb3 100644 --- a/libavcodec/mpegaudiodec_fixed.c +++ b/libavcodec/mpegaudiodec_fixed.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "config_components.h" #include "libavutil/samplefmt.h" #define USE_FLOATS 0 diff --git a/libavcodec/mpegaudiodec_float.c b/libavcodec/mpegaudiodec_float.c index c7b7839997..912e6d189a 100644 --- a/libavcodec/mpegaudiodec_float.c +++ b/libavcodec/mpegaudiodec_float.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "config_components.h" #include "libavutil/samplefmt.h" #define USE_FLOATS 1 diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index fc970e9614..3c793bcc22 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -27,6 +27,8 @@ * The simplest mpeg encoder (well, it was the simplest!). */ +#include "config_components.h" + #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/imgutils.h" diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index c69114ea15..71c999fab0 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -31,6 +31,8 @@ * The simplest mpeg encoder (well, it was the simplest!). */ +#include "config_components.h" + #include #include "libavutil/internal.h" diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c index 876a7375f8..9a450b7c8e 100644 --- a/libavcodec/mpegvideo_motion.c +++ b/libavcodec/mpegvideo_motion.c @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avassert.h" #include "libavutil/internal.h" #include "libavutil/mem_internal.h" diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index f12586dd64..455436e9c4 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -27,6 +27,8 @@ * MSMPEG4 backend for encoder and decoder */ +#include "config_components.h" + #include "libavutil/thread.h" #include "avcodec.h" diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index 29edd94427..afbeda4fac 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/thread.h" #include "avcodec.h" diff --git a/libavcodec/mvcdec.c b/libavcodec/mvcdec.c index ae5ce4c0d7..410fd95875 100644 --- a/libavcodec/mvcdec.c +++ b/libavcodec/mvcdec.c @@ -24,6 +24,8 @@ * Silicon Graphics Motion Video Compressor 1 & 2 decoder */ +#include "config_components.h" + #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/options.c b/libavcodec/options.c index bba6078b62..5e396e9f29 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -24,6 +24,8 @@ * Options definition for AVCodecContext. */ +#include "config_components.h" + #include "avcodec.h" #include "internal.h" #include "libavutil/avassert.h" diff --git a/libavcodec/opus_pvq.c b/libavcodec/opus_pvq.c index a4ab7c46eb..750360d737 100644 --- a/libavcodec/opus_pvq.c +++ b/libavcodec/opus_pvq.c @@ -23,6 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "opustab.h" #include "opus_pvq.h" diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index e9b8eab484..e535446765 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -25,6 +25,7 @@ */ #include "config.h" +#include "config_components.h" #include "libavutil/attributes.h" #include "libavutil/float_dsp.h" #include "libavutil/thread.h" diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index a335a29b08..bd6feeadef 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -21,6 +21,8 @@ //#define DEBUG +#include "config_components.h" + #include "libavutil/avassert.h" #include "libavutil/bprint.h" #include "libavutil/crc.h" diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index 01f9dade1a..57c426b0c9 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "avcodec.h" #include "internal.h" #include "put_bits.h" diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 8378f90d08..58337a6499 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" #include "libavutil/pixdesc.h" diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 3ab6666f74..e3016df55d 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -28,6 +28,8 @@ #define LONG_BITSTREAM_READER +#include "config_components.h" + #include "libavutil/internal.h" #include "libavutil/mem_internal.h" diff --git a/libavcodec/qpeldsp.c b/libavcodec/qpeldsp.c index 6e52b33657..c1eab6120d 100644 --- a/libavcodec/qpeldsp.c +++ b/libavcodec/qpeldsp.c @@ -29,6 +29,7 @@ #include #include "config.h" +#include "config_components.h" #include "libavutil/attributes.h" #include "copy_block.h" #include "qpeldsp.h" diff --git a/libavcodec/r210dec.c b/libavcodec/r210dec.c index 476f1c0680..3acb5e58c7 100644 --- a/libavcodec/r210dec.c +++ b/libavcodec/r210dec.c @@ -21,6 +21,7 @@ */ #include "avcodec.h" +#include "config_components.h" #include "internal.h" #include "libavutil/bswap.h" #include "libavutil/common.h" diff --git a/libavcodec/r210enc.c b/libavcodec/r210enc.c index 7a72ba4695..cd349f3b4f 100644 --- a/libavcodec/r210enc.c +++ b/libavcodec/r210enc.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "avcodec.h" #include "encode.h" #include "internal.h" diff --git a/libavcodec/rv34_parser.c b/libavcodec/rv34_parser.c index 03469ed0d1..e17bc8562d 100644 --- a/libavcodec/rv34_parser.c +++ b/libavcodec/rv34_parser.c @@ -24,6 +24,8 @@ * RV30/40 parser */ +#include "config_components.h" + #include "parser.h" #include "libavutil/intreadwrite.h" diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index cf1cfb1460..560a5fc242 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -18,6 +18,9 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "config_components.h" + #include "avcodec.h" #include "encode.h" #include "get_bits.h" diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c index a1b43f8f80..e17e0d97b9 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -24,6 +24,8 @@ * Sunplus JPEG decoder (SP5X). */ +#include "config_components.h" + #include "avcodec.h" #include "internal.h" #include "mjpeg.h" diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index fd4ea0d75e..77c5e46e4b 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -27,6 +27,7 @@ #define BITSTREAM_READER_LE #include "config.h" +#include "config_components.h" #include "libavutil/attributes.h" #include "libavutil/mem_internal.h" diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c index e59af7f0d3..cd7b6e1763 100644 --- a/libavcodec/speedhqenc.c +++ b/libavcodec/speedhqenc.c @@ -27,6 +27,8 @@ * SpeedHQ encoder. */ +#include "config_components.h" + #include "libavutil/thread.h" #include "avcodec.h" diff --git a/libavcodec/srtdec.c b/libavcodec/srtdec.c index 4f16226b83..f7c131ff3d 100644 --- a/libavcodec/srtdec.c +++ b/libavcodec/srtdec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/common.h" #include "libavutil/intreadwrite.h" diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c index 2e3ac55770..508770e319 100644 --- a/libavcodec/srtenc.c +++ b/libavcodec/srtenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include #include "avcodec.h" #include "libavutil/avstring.h" diff --git a/libavcodec/textdec.c b/libavcodec/textdec.c index 308553660a..420fcd1b14 100644 --- a/libavcodec/textdec.c +++ b/libavcodec/textdec.c @@ -23,6 +23,8 @@ * Raw subtitles decoder */ +#include "config_components.h" + #include "avcodec.h" #include "ass.h" #include "internal.h" diff --git a/libavcodec/v408dec.c b/libavcodec/v408dec.c index 749b3b65e5..f1b84421b1 100644 --- a/libavcodec/v408dec.c +++ b/libavcodec/v408dec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "avcodec.h" #include "internal.h" diff --git a/libavcodec/v408enc.c b/libavcodec/v408enc.c index 31bf48406c..50766772c2 100644 --- a/libavcodec/v408enc.c +++ b/libavcodec/v408enc.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "encode.h" diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index d9939a8ba1..1c92b9d401 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -26,6 +26,8 @@ * VC-1 and WMV3 decoder */ +#include "config_components.h" + #include "avcodec.h" #include "blockdsp.h" #include "get_bits.h" diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c index 04fc8b12f3..a29b91bf3d 100644 --- a/libavcodec/vc1dsp.c +++ b/libavcodec/vc1dsp.c @@ -24,6 +24,8 @@ * VC-1 and WMV3 decoder */ +#include "config_components.h" + #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/intreadwrite.h" diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 29c781cda4..9083f6ff29 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "config_components.h" #include "videotoolbox.h" #include "libavutil/hwcontext_videotoolbox.h" #include "vt_internal.h" diff --git a/libavcodec/vorbis_parser.c b/libavcodec/vorbis_parser.c index 194ae13da3..a7d15d4ce9 100644 --- a/libavcodec/vorbis_parser.c +++ b/libavcodec/vorbis_parser.c @@ -25,6 +25,8 @@ * Determines the duration for each packet. */ +#include "config_components.h" + #include "libavutil/log.h" #include "get_bits.h" diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index e2418eb6fa..64532a70db 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -30,6 +30,8 @@ * Theora decoder by Alex Beregszaszi */ +#include "config_components.h" + #include #include #include diff --git a/libavcodec/vp56dsp.c b/libavcodec/vp56dsp.c index de6803e0fb..d368e3292d 100644 --- a/libavcodec/vp56dsp.c +++ b/libavcodec/vp56dsp.c @@ -22,6 +22,7 @@ #include #include "config.h" +#include "config_components.h" #include "libavutil/attributes.h" #include "vp56dsp.h" #include "libavutil/common.h" diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index d779804e64..08338bc247 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -24,6 +24,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/imgutils.h" #include "libavutil/mem_internal.h" diff --git a/libavcodec/vp8dsp.c b/libavcodec/vp8dsp.c index 732a483b62..23f49b2c25 100644 --- a/libavcodec/vp8dsp.c +++ b/libavcodec/vp8dsp.c @@ -25,6 +25,8 @@ * VP8 compatible video decoder */ +#include "config_components.h" + #include "libavutil/common.h" #include "libavutil/intreadwrite.h" diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 7ef10f7a80..5da1b8a72e 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "avcodec.h" #include "get_bits.h" #include "hwconfig.h" diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 9955aaa7d6..a27eb368e8 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -33,6 +33,8 @@ * should be 4 extra bytes for v1 data and 6 extra bytes for v2 data. */ +#include "config_components.h" + #include "libavutil/attributes.h" #include "libavutil/ffmath.h" diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 66e3537cb0..7bd89556ea 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/attributes.h" #include "libavutil/ffmath.h" diff --git a/libavcodec/x86/flacdsp_init.c b/libavcodec/x86/flacdsp_init.c index 6315b6903e..ed2e5ed15b 100644 --- a/libavcodec/x86/flacdsp_init.c +++ b/libavcodec/x86/flacdsp_init.c @@ -22,6 +22,7 @@ #include "libavcodec/flacdsp.h" #include "libavutil/x86/cpu.h" #include "config.h" +#include "config_components.h" void ff_flac_lpc_32_sse4(int32_t *samples, const int coeffs[32], int order, int qlevel, int len); diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c index d89928cec6..6336587281 100644 --- a/libavcodec/x86/hpeldsp_init.c +++ b/libavcodec/x86/hpeldsp_init.c @@ -22,6 +22,8 @@ * MMX optimization by Nick Kurshev */ +#include "config_components.h" + #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/x86/cpu.h" diff --git a/libavfilter/aeval.c b/libavfilter/aeval.c index 42cfa81325..3717d9057a 100644 --- a/libavfilter/aeval.c +++ b/libavfilter/aeval.c @@ -23,6 +23,8 @@ * eval audio source */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/eval.h" diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c index c57709050e..5f12b1da43 100644 --- a/libavfilter/af_afade.c +++ b/libavfilter/af_afade.c @@ -23,6 +23,8 @@ * fade audio filter */ +#include "config_components.h" + #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c index 682f17c7dd..00990056cc 100644 --- a/libavfilter/af_agate.c +++ b/libavfilter/af_agate.c @@ -23,6 +23,8 @@ * Audio (Sidechain) Gate filter */ +#include "config_components.h" + #include "libavutil/audio_fifo.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c index ee42b2a034..0da2643a3b 100644 --- a/libavfilter/af_biquads.c +++ b/libavfilter/af_biquads.c @@ -62,6 +62,8 @@ * V */ +#include "config_components.h" + #include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/ffmath.h" diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index c0ce82066b..f2bb55bc97 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -24,6 +24,8 @@ * Audio (Sidechain) Compressor filter */ +#include "config_components.h" + #include "libavutil/audio_fifo.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index 610dc98c93..402868b5bb 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -26,6 +26,8 @@ * (by Michael Niedermayer) and lavfi/avf_showwaves (by Stefano Sabatini). */ +#include "config_components.h" + #include #include diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c index 853f6bbdcb..cd9c96486c 100644 --- a/libavfilter/avf_showwaves.c +++ b/libavfilter/avf_showwaves.c @@ -23,6 +23,8 @@ * audio to video multimedia filter */ +#include "config_components.h" + #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" diff --git a/libavfilter/f_bench.c b/libavfilter/f_bench.c index 109a530d7c..9b55194dbc 100644 --- a/libavfilter/f_bench.c +++ b/libavfilter/f_bench.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/opt.h" #include "libavutil/time.h" #include "avfilter.h" diff --git a/libavfilter/f_cue.c b/libavfilter/f_cue.c index d90fe54b9a..9a1b7c03b8 100644 --- a/libavfilter/f_cue.c +++ b/libavfilter/f_cue.c @@ -18,6 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/opt.h" #include "libavutil/time.h" #include "avfilter.h" diff --git a/libavfilter/f_drawgraph.c b/libavfilter/f_drawgraph.c index b6fcb3b75e..000255fc52 100644 --- a/libavfilter/f_drawgraph.c +++ b/libavfilter/f_drawgraph.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "float.h" #include "libavutil/avstring.h" diff --git a/libavfilter/f_graphmonitor.c b/libavfilter/f_graphmonitor.c index 9cc5ea940e..e6a7c08360 100644 --- a/libavfilter/f_graphmonitor.c +++ b/libavfilter/f_graphmonitor.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "float.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/f_interleave.c b/libavfilter/f_interleave.c index b60e89762f..74597a0ec6 100644 --- a/libavfilter/f_interleave.c +++ b/libavfilter/f_interleave.c @@ -23,6 +23,8 @@ * audio and video interleaver */ +#include "config_components.h" + #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/opt.h" diff --git a/libavfilter/f_latency.c b/libavfilter/f_latency.c index 6f16d6677e..f04fd726f2 100644 --- a/libavfilter/f_latency.c +++ b/libavfilter/f_latency.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" diff --git a/libavfilter/f_loop.c b/libavfilter/f_loop.c index f8ae4a6a3a..fff503776d 100644 --- a/libavfilter/f_loop.c +++ b/libavfilter/f_loop.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/audio_fifo.h" #include "libavutil/fifo.h" #include "libavutil/internal.h" diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index 5f5091e9b7..82491f2bb8 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -23,6 +23,8 @@ * filter for manipulating frame metadata */ +#include "config_components.h" + #include #include "libavutil/avassert.h" diff --git a/libavfilter/f_perms.c b/libavfilter/f_perms.c index 5e2f4ecdf4..e26a15fd06 100644 --- a/libavfilter/f_perms.c +++ b/libavfilter/f_perms.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/lfg.h" #include "libavutil/opt.h" #include "libavutil/random_seed.h" diff --git a/libavfilter/f_realtime.c b/libavfilter/f_realtime.c index 9a60ded0ca..78da5dc3a7 100644 --- a/libavfilter/f_realtime.c +++ b/libavfilter/f_realtime.c @@ -18,6 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/opt.h" #include "libavutil/time.h" #include "avfilter.h" diff --git a/libavfilter/f_reverse.c b/libavfilter/f_reverse.c index f7a7e716fa..813a32d0e9 100644 --- a/libavfilter/f_reverse.c +++ b/libavfilter/f_reverse.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/opt.h" #include "avfilter.h" #include "formats.h" diff --git a/libavfilter/f_segment.c b/libavfilter/f_segment.c index dd94eb9360..03a071a05b 100644 --- a/libavfilter/f_segment.c +++ b/libavfilter/f_segment.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include #include "libavutil/avstring.h" diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c index b61d88f4fe..1cfe2d59e5 100644 --- a/libavfilter/f_select.c +++ b/libavfilter/f_select.c @@ -23,6 +23,8 @@ * filter for selecting which frame passes in the filterchain */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/eval.h" #include "libavutil/fifo.h" diff --git a/libavfilter/f_sendcmd.c b/libavfilter/f_sendcmd.c index 04bfc84a06..857b841313 100644 --- a/libavfilter/f_sendcmd.c +++ b/libavfilter/f_sendcmd.c @@ -23,6 +23,8 @@ * send commands filter */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/bprint.h" #include "libavutil/eval.h" diff --git a/libavfilter/f_sidedata.c b/libavfilter/f_sidedata.c index 8eccd4a06e..82bbaa0e7e 100644 --- a/libavfilter/f_sidedata.c +++ b/libavfilter/f_sidedata.c @@ -21,6 +21,8 @@ * filter for manipulating frame side data */ +#include "config_components.h" + #include "libavutil/avassert.h" #include "libavutil/internal.h" #include "libavutil/frame.h" diff --git a/libavfilter/lut3d.h b/libavfilter/lut3d.h index bc32eac91c..97cd413233 100644 --- a/libavfilter/lut3d.h +++ b/libavfilter/lut3d.h @@ -21,6 +21,8 @@ #ifndef AVFILTER_LUT3D_H #define AVFILTER_LUT3D_H +#include "config_components.h" + #include "libavutil/pixdesc.h" #include "framesync.h" #include "avfilter.h" diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index 054feb05f1..171fae88c0 100644 --- a/libavfilter/setpts.c +++ b/libavfilter/setpts.c @@ -24,6 +24,8 @@ * video presentation timestamp (PTS) modification filter */ +#include "config_components.h" + #include #include "libavutil/eval.h" diff --git a/libavfilter/settb.c b/libavfilter/settb.c index 67d310afbd..5f589004f8 100644 --- a/libavfilter/settb.c +++ b/libavfilter/settb.c @@ -23,6 +23,8 @@ * Set timebase for the output link. */ +#include "config_components.h" + #include #include diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index b89a680883..86b304213b 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -27,6 +27,8 @@ * @todo support a PTS correction mechanism */ +#include "config_components.h" + #include #include diff --git a/libavfilter/trim.c b/libavfilter/trim.c index e627903c64..06c50cd91a 100644 --- a/libavfilter/trim.c +++ b/libavfilter/trim.c @@ -19,6 +19,7 @@ #include #include "config.h" +#include "config_components.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index 2d1eaa954b..0a10a5a176 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -23,6 +23,8 @@ * aspect ratio modification video filters */ +#include "config_components.h" + #include #include "libavutil/common.h" diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 2d433e439f..c882086c51 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/imgutils.h" #include "libavutil/intfloat.h" #include "libavutil/eval.h" diff --git a/libavfilter/vf_colorconstancy.c b/libavfilter/vf_colorconstancy.c index ba6359462e..db7e20df53 100644 --- a/libavfilter/vf_colorconstancy.c +++ b/libavfilter/vf_colorconstancy.c @@ -28,6 +28,8 @@ * J. van de Weijer, Th. Gevers, A. Gijsenij "Edge-Based Color Constancy". */ +#include "config_components.h" + #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_colorkey.c b/libavfilter/vf_colorkey.c index ed43722c03..96e0f12878 100644 --- a/libavfilter/vf_colorkey.c +++ b/libavfilter/vf_colorkey.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/opt.h" #include "libavutil/imgutils.h" #include "avfilter.h" diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c index 6e6fe0d887..9a9c099e6d 100644 --- a/libavfilter/vf_convolution.c +++ b/libavfilter/vf_convolution.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" diff --git a/libavfilter/vf_convolve.c b/libavfilter/vf_convolve.c index 55afb582b4..a61a32f007 100644 --- a/libavfilter/vf_convolve.c +++ b/libavfilter/vf_convolve.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include #include "libavutil/imgutils.h" diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c index 919652e50f..f1da075fe2 100644 --- a/libavfilter/vf_drawbox.c +++ b/libavfilter/vf_drawbox.c @@ -25,6 +25,8 @@ * that needs to write in the input frame. */ +#include "config_components.h" + #include "libavutil/colorspace.h" #include "libavutil/common.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c index 0b26d92269..60b55578cf 100644 --- a/libavfilter/vf_extractplanes.c +++ b/libavfilter/vf_extractplanes.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index c78acbf87b..24b1c9ca61 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -23,6 +23,8 @@ * format and noformat video filters */ +#include "config_components.h" + #include #include "libavutil/internal.h" diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index bf80b2c4fc..ced7cda6f4 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/colorspace.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" diff --git a/libavfilter/vf_identity.c b/libavfilter/vf_identity.c index cc30761388..84def7959b 100644 --- a/libavfilter/vf_identity.c +++ b/libavfilter/vf_identity.c @@ -23,6 +23,8 @@ * Calculate the Identity between two input videos. */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index fd5b364797..621291cdad 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -24,6 +24,8 @@ * value, and apply it to input video. */ +#include "config_components.h" + #include "libavutil/attributes.h" #include "libavutil/bswap.h" #include "libavutil/common.h" diff --git a/libavfilter/vf_lut2.c b/libavfilter/vf_lut2.c index 868c0496fa..49755544b0 100644 --- a/libavfilter/vf_lut2.c +++ b/libavfilter/vf_lut2.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/attributes.h" #include "libavutil/common.h" #include "libavutil/eval.h" diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index 8206517579..c04504bba0 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" diff --git a/libavfilter/vf_neighbor.c b/libavfilter/vf_neighbor.c index f48fb306b2..d6638779e5 100644 --- a/libavfilter/vf_neighbor.c +++ b/libavfilter/vf_neighbor.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_premultiply.c b/libavfilter/vf_premultiply.c index 4b60de7b7b..e077d46a9a 100644 --- a/libavfilter/vf_premultiply.c +++ b/libavfilter/vf_premultiply.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/imgutils.h" #include "libavutil/pixdesc.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_setparams.c b/libavfilter/vf_setparams.c index b3893adc13..95a2d15c02 100644 --- a/libavfilter/vf_setparams.c +++ b/libavfilter/vf_setparams.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/pixfmt.h" #include "libavutil/opt.h" #include "avfilter.h" diff --git a/libavfilter/vf_stack.c b/libavfilter/vf_stack.c index f584e8349b..aa32a1bf5e 100644 --- a/libavfilter/vf_stack.c +++ b/libavfilter/vf_stack.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_xmedian.c b/libavfilter/vf_xmedian.c index 148ab555bb..155e464ba6 100644 --- a/libavfilter/vf_xmedian.c +++ b/libavfilter/vf_xmedian.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index 20b915d472..f859cf2f48 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -33,6 +33,8 @@ * allyuv, smptebars and smptehdbars are by Paul B Mahol. */ +#include "config_components.h" + #include #include "libavutil/avassert.h" diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c index ad9b65a9be..51461befd8 100644 --- a/libavformat/ac3dec.c +++ b/libavformat/ac3dec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avassert.h" #include "libavutil/crc.h" #include "libavcodec/ac3_parser.h" diff --git a/libavformat/alp.c b/libavformat/alp.c index f46bdb4511..d4a8db240e 100644 --- a/libavformat/alp.c +++ b/libavformat/alp.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/amr.c b/libavformat/amr.c index bc22c2f84f..c366b8f1b0 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -23,6 +23,8 @@ Write and read amr data according to RFC3267, http://www.ietf.org/rfc/rfc3267.txt?number=3267 */ +#include "config_components.h" + #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "avformat.h" diff --git a/libavformat/apm.c b/libavformat/apm.c index 1ced771745..7bf399f663 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -19,6 +19,9 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "config_components.h" + #include "avformat.h" #include "internal.h" #include "rawenc.h" diff --git a/libavformat/aptxdec.c b/libavformat/aptxdec.c index 7153e262a1..0fa5051785 100644 --- a/libavformat/aptxdec.c +++ b/libavformat/aptxdec.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/opt.h" #include "avformat.h" diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index d26844d1e2..edf005c69d 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -19,6 +19,9 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "config_components.h" + #include "libavutil/avstring.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/argo_cvg.c b/libavformat/argo_cvg.c index dfdf126c17..deca57a322 100644 --- a/libavformat/argo_cvg.c +++ b/libavformat/argo_cvg.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "avformat.h" diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 041019b186..5b34f98a2b 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avassert.h" #include "libavutil/dict.h" #include "libavutil/mathematics.h" diff --git a/libavformat/au.c b/libavformat/au.c index 9bd408f65c..4d5671f181 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -27,6 +27,8 @@ * http://www.goice.co.jp/member/mo/formats/au.html */ +#include "config_components.h" + #include "libavutil/bprint.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index 6e1c2a45ff..350f5360d5 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "config_components.h" #include "libavutil/common.h" #include "libavutil/opt.h" diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 455dce0733..3c749aec14 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include #include "libavutil/avassert.h" diff --git a/libavformat/avienc.c b/libavformat/avienc.c index be2493ce55..e36e88335f 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -25,6 +25,7 @@ #include "internal.h" #include "avi.h" #include "avio_internal.h" +#include "config_components.h" #include "riff.h" #include "mpegts.h" #include "libavformat/avlanguage.h" diff --git a/libavformat/bintext.c b/libavformat/bintext.c index 1270c7fb2c..0465b86f4b 100644 --- a/libavformat/bintext.c +++ b/libavformat/bintext.c @@ -30,6 +30,8 @@ * iCEDraw File demuxer */ +#include "config_components.h" + #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" diff --git a/libavformat/bit.c b/libavformat/bit.c index 380cbd37cd..b1dc237dce 100644 --- a/libavformat/bit.c +++ b/libavformat/bit.c @@ -18,6 +18,9 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "config_components.h" + #include "avformat.h" #include "internal.h" #include "libavcodec/get_bits.h" diff --git a/libavformat/codec2.c b/libavformat/codec2.c index 0b992836b3..b10b5c34c4 100644 --- a/libavformat/codec2.c +++ b/libavformat/codec2.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include #include "libavcodec/codec2utils.h" #include "libavutil/channel_layout.h" diff --git a/libavformat/concat.c b/libavformat/concat.c index faeba2293a..dc0985e40c 100644 --- a/libavformat/concat.c +++ b/libavformat/concat.c @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/bprint.h" #include "libavutil/mem.h" diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 4709bc6615..1bd5aac956 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "config_components.h" #if HAVE_UNISTD_H #include #endif diff --git a/libavformat/demux.c b/libavformat/demux.c index ec34b65288..1fdee84933 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -22,6 +22,7 @@ #include #include "config.h" +#include "config_components.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" diff --git a/libavformat/file.c b/libavformat/file.c index 7001750c80..063d7c5aa2 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/internal.h" #include "libavutil/opt.h" diff --git a/libavformat/format.c b/libavformat/format.c index 52b85c16a2..5f8155be59 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/bprint.h" #include "libavutil/opt.h" diff --git a/libavformat/g726.c b/libavformat/g726.c index 4b08d0a9f7..e64e54114c 100644 --- a/libavformat/g726.c +++ b/libavformat/g726.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "avformat.h" #include "internal.h" #include "libavutil/opt.h" diff --git a/libavformat/gopher.c b/libavformat/gopher.c index 9bbe171640..9497ffacf2 100644 --- a/libavformat/gopher.c +++ b/libavformat/gopher.c @@ -24,6 +24,7 @@ */ #include "config.h" +#include "config_components.h" #include "libavutil/avstring.h" #include "avformat.h" diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c index 622491d2e5..1aaba0b306 100644 --- a/libavformat/hashenc.c +++ b/libavformat/hashenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/hash.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/hls.c b/libavformat/hls.c index 06bc46c23f..cf6ef9dfb6 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -27,6 +27,8 @@ * https://www.rfc-editor.org/rfc/rfc8216.txt */ +#include "config_components.h" + #include "libavformat/http.h" #include "libavutil/avstring.h" #include "libavutil/avassert.h" diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index ef8973cea1..14eb7c4530 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "config_components.h" #include #include #if HAVE_UNISTD_H diff --git a/libavformat/http.c b/libavformat/http.c index c79db955e8..c4eeb58cd0 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "config_components.h" #if CONFIG_ZLIB #include diff --git a/libavformat/ilbc.c b/libavformat/ilbc.c index 0cbdd3d5b8..b2ac8159a6 100644 --- a/libavformat/ilbc.c +++ b/libavformat/ilbc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "avformat.h" #include "internal.h" #include "rawenc.h" diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 8608252d83..b9c06c5b54 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #define _DEFAULT_SOURCE #define _BSD_SOURCE #include diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index ded91d6b98..9b3b8741c8 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/intreadwrite.h" #include "libavutil/avstring.h" #include "libavutil/dict.h" diff --git a/libavformat/kvag.c b/libavformat/kvag.c index a277c28128..3df2c4f670 100644 --- a/libavformat/kvag.c +++ b/libavformat/kvag.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/channel_layout.h" #include "avformat.h" #include "avio_internal.h" diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 95e49cbe7f..53cd538580 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -29,6 +29,7 @@ */ #include "config.h" +#include "config_components.h" #include #include diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index e8df5db3bd..93c969bf03 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -22,6 +22,7 @@ #include #include "config.h" +#include "config_components.h" #include "av1.h" #include "avc.h" diff --git a/libavformat/mj2kdec.c b/libavformat/mj2kdec.c index 703ff91efb..2373f31b94 100644 --- a/libavformat/mj2kdec.c +++ b/libavformat/mj2kdec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/intreadwrite.h" #include "avformat.h" #include "rawdec.h" diff --git a/libavformat/mlpdec.c b/libavformat/mlpdec.c index f0996fef31..4834f697f3 100644 --- a/libavformat/mlpdec.c +++ b/libavformat/mlpdec.c @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "avformat.h" #include "avio_internal.h" #include "internal.h" diff --git a/libavformat/mmf.c b/libavformat/mmf.c index e836390bff..2db91febb5 100644 --- a/libavformat/mmf.c +++ b/libavformat/mmf.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/channel_layout.h" #include "avformat.h" #include "avio_internal.h" diff --git a/libavformat/mov.c b/libavformat/mov.c index a842bf4464..5984b73050 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -23,6 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include #include #include diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 14482abe8d..893deceb1b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include #include diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index ca15d9f241..7eb24cd5c2 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/channel_layout.h" #include "avformat.h" #include "avio_internal.h" diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 64248695bd..79fd6b28b0 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include #include "libavutil/attributes.h" diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index e23f596490..da77b50669 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/buffer.h" #include "libavutil/common.h" #include "libavutil/crc.h" diff --git a/libavformat/network.c b/libavformat/network.c index 1ced314c92..21e20b3e9a 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include #include "network.h" #include "tls.h" diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 31f47dadf6..016047f616 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include #include "libavutil/crc.h" diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c index 63539a47c0..f6123ae90d 100644 --- a/libavformat/pcmdec.c +++ b/libavformat/pcmdec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/pcmenc.c b/libavformat/pcmenc.c index cbfcee7b41..0cf497989a 100644 --- a/libavformat/pcmenc.c +++ b/libavformat/pcmenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "avformat.h" #include "rawenc.h" diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 15e26c03bd..17649bc077 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "avformat.h" #include "internal.h" #include "avio_internal.h" diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index f8c267c4c9..c8e7ca818b 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/intreadwrite.h" #include "avformat.h" diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c index 7b1a534452..514e4e044f 100644 --- a/libavformat/rawvideodec.c +++ b/libavformat/rawvideodec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/imgutils.h" #include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" diff --git a/libavformat/riff.c b/libavformat/riff.c index f098c1d580..df7e9df31b 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -21,6 +21,7 @@ #include #include "config.h" +#include "config_components.h" #include "libavutil/macros.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 88557140f7..f97e3c3b8e 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -24,6 +24,8 @@ * RTMP protocol */ +#include "config_components.h" + #include "libavcodec/bytestream.h" #include "libavutil/avstring.h" #include "libavutil/base64.h" diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index f1992f193e..f8aa3dfe1e 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avassert.h" #include "libavutil/base64.h" #include "libavutil/bprint.h" diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index eee6329025..bbabec7db8 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" diff --git a/libavformat/sdp.c b/libavformat/sdp.c index d63a0b34c4..7644cb6c2a 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include #include "libavutil/avstring.h" #include "libavutil/base64.h" diff --git a/libavformat/segment.c b/libavformat/segment.c index e9b0aa4fa8..ef0529a920 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -24,6 +24,8 @@ * @url{http://tools.ietf.org/id/draft-pantos-http-live-streaming} */ +#include "config_components.h" + #include #include diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index 9eb22ee9b3..3b4aa614ca 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include "libavcodec/put_bits.h" #include "libavutil/avassert.h" #include "libavutil/fifo.h" diff --git a/libavformat/voc.c b/libavformat/voc.c index 04ec0da9ba..a836ecb79b 100644 --- a/libavformat/voc.c +++ b/libavformat/voc.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "config_components.h" #include "voc.h" #include "internal.h" diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 01090b6947..c53e6a1841 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -28,6 +28,7 @@ #include #include "config.h" +#include "config_components.h" #include "libavutil/avassert.h" #include "libavutil/dict.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c index 2317700be1..75a97e8244 100644 --- a/libavformat/wavenc.c +++ b/libavformat/wavenc.c @@ -28,6 +28,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config_components.h" + #include #include