From patchwork Wed Feb 23 14:29:39 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: 34474 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp889870nkx; Wed, 23 Feb 2022 06:30:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJyMhBFhK59NUHGw6c56aw+0EYnvsuWQ2VfRlk7b/XFi0M7N8QG3r4/5JvKmK+QPAbWF0PzM X-Received: by 2002:a05:6402:51d2:b0:412:e48e:51 with SMTP id r18-20020a05640251d200b00412e48e0051mr20585595edd.220.1645626612934; Wed, 23 Feb 2022 06:30:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626612; cv=none; d=google.com; s=arc-20160816; b=KXmexdHJJaC2pAjPpVZqgqTLNXPPkaRTtYZWAm7rsKLfy3FDllFts5giVrmax3glrT PA9teCpftfJOZNsL119Bhvyddji4++5EQdIPin2dFAyF/gkSvIsbIc688CO1JD4G/COu PSFUzCUhw6NNdi5wk1wrL2EgVLPTQH0ufJRr84QbF/HVUEw7SNEToTJGFgI1fMfUl1sp LPBxRbGHBSKMEIIuD+eHtyj6ucH0W7WrvSYiYY/yEu+/TQ8J6m+r73cXtqk8pWKbFlYJ qbIls0T9ryiaX6J2gHQfGRszYFa6ZIpB0LPukCkpZZ7/cM/NaLLW4u14tSbrIE7U93rR 9sgw== 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=AwFvHTsBRxjC/hJ4TOuk4iYHEVkjyk8gARavXFgLT9M=; b=OL2VH3K3W3iWHgT6kDqerK4ijQBIj0SR91APetPkFpAMyl5h4QpqMp3nbTm2R1pn7L 1efFzPH489cpmW+1xuIvG85NUs/JbZn8RxzzlIDGPpCDtvx5nLbDUYqrahPhgVhd/KIb BAuupaTtoo0GEyMGcaFVj2h84+6d0uS+HUVE0JiuzJshM1kzHse/TuUEt0tL9CzFUO2P iYjBRx+YTRSPl4nviJDOpFEzbC7TC/BaZxtc6lmXrXmTIJPKtQRYfOZHXGqA6ApATFBj ov2luf0Tuzg/OjWKY9nbaFCeut+7tAOGm6mbLkrt4ZF1mP18xqttuXOomV5CGqdn/ow7 Yaxg== 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=tJPrUKUB; 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 d2si14364758edx.117.2022.02.23.06.30.12; Wed, 23 Feb 2022 06:30:12 -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=tJPrUKUB; 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 649C168B23A; Wed, 23 Feb 2022 16:30:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 443EE68B1D1 for ; Wed, 23 Feb 2022 16:29:54 +0200 (EET) Received: by mail-wr1-f49.google.com with SMTP id p9so39927308wra.12 for ; Wed, 23 Feb 2022 06:29:54 -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=Rw7NUkB3yxqx264g+TeFxcM/4LiUWNPd0fqkYxUi+0o=; b=tJPrUKUBcBfBPUWJejJX3aB23za6dCMn7nln5N8mWWemciHUFv6ODRe4kNPt/LXHd+ evD0mxQ8WjVKwSnKXviJQSajAyOINN83qJgQ5Wh4OOdUrHggsRwP2F/vcZekAtMMqdDS FQJTIUaKPYwfJDTzxuDJuI3PIehwZv+7JXXNtwm8yuphM9DIK9kopgLMURgXuZBPsGhG V7f8ov2O0adfR7JWO5/r2RnwscncX5CTJTCAF1O7VQKoXvUMQE6r2kUsLem9WHFc4cDI RH11AtNWJGwsTCkPnMiOeXZfQjslEyvr8rzI1AaWTBMIusBl4dBLeBXhfQph6AW0WZUB +42g== 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=Rw7NUkB3yxqx264g+TeFxcM/4LiUWNPd0fqkYxUi+0o=; b=0gzIiAwc/0WGn+5BQosvHwjeAg/FpnC/10fW2cIeXc28SKCrkbzfB3jkulLyDIxG+m yRlp/kgfzDW8mtxMYRHZeac5WPAEi3UtpplU91WVbTbMDGwQH0p+kd0/dHN/5oodFd0f Urk///9nP6SWj8OBSKaMS9x46ckWNKtn7VjT3F9l92Xv1Msqke1YJ8Kxw3XmgmwTKBep rOaSPprI6MvpvbP3I6sJKG0g7pw2NEhfWc3vvjS50yS761iyMmXnv+fnF5fBTi9wOh4l /wsqiCfle+bKFuTPoDIcmPQ/wsNohM746UMARdG/eRHOn998kAqOSp5PmWgpetRLTjVa 5vag== X-Gm-Message-State: AOAM533BbGzUOPyIayWPLGEzvuuXsfVf8lvwiBgrOITBl09PQpYqsIXx 0si7pL3GNjmrER05ugCHnXeristGi4IeYImJ X-Received: by 2002:a05:6000:1564:b0:1ea:80d6:1bb1 with SMTP id 4-20020a056000156400b001ea80d61bb1mr7181772wrz.533.1645626593717; Wed, 23 Feb 2022 06:29:53 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id bg20-20020a05600c3c9400b0037fa5c422c8sm6282651wmb.48.2022.02.23.06.29.53 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:29:53 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:39 +0200 Message-Id: <20220223142951.40366-2-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220223142951.40366-1-martin@martin.st> References: <20220223142951.40366-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/13] libavutil: Remove leftover uses of 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: zp3GYWglVHbm These headers probably have used defines like FF_API_* before, but no longer do that, and doesn't directly seem to use anything else from that header either. --- libavutil/common.h | 1 - libavutil/internal.h | 1 - 2 files changed, 2 deletions(-) diff --git a/libavutil/common.h b/libavutil/common.h index 3eb9bc5f74..fd1404be6c 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -41,7 +41,6 @@ #include "attributes.h" #include "macros.h" -#include "version.h" //rounded division & shift #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) diff --git a/libavutil/internal.h b/libavutil/internal.h index 0a7f1c6257..79c2130be0 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -43,7 +43,6 @@ #include "dict.h" #include "macros.h" #include "pixfmt.h" -#include "version.h" #if ARCH_X86 # include "x86/emms.h" From patchwork Wed Feb 23 14:29:40 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: 34475 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp890022nkx; Wed, 23 Feb 2022 06:30:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJxRuslSl2Iwx6asIdlpz+riaiSKhvDS9MJX8wWa1tVJWBHQjoCpFWXJed66FzPmBSW2EM7V X-Received: by 2002:a17:906:edb5:b0:6b8:1a5a:f3a0 with SMTP id sa21-20020a170906edb500b006b81a5af3a0mr24110770ejb.501.1645626623053; Wed, 23 Feb 2022 06:30:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626623; cv=none; d=google.com; s=arc-20160816; b=aTa+IHdVaP80RWenQFVjW3Qnbq9VN4paMXdHCR1kQNldv5mOTuXrM5GGvvqt8mLj9C YLhx6Pb43+bK7KLVRi7EcbpRGgT2Ae5Gca+rY/5KIhDkDBE20+R+aWCyRHV5O0PggzTq g72ZCpWjxZ8/SX+mS311aR/g8U4WQGXdifkNYud5lvj0n3y5YN/I2Zk7GJaKS1pcy5dr LyFOdK9hZD584/oNVAKpG3YzMWCusOVDsmkiTpZeat1pZGPga/CEXrpEOZ1UrpWLjSNj hPeL0EedTrFidRBFxXTHYc1Xx36wuNeu3V8HdanK/okBjJtmLm0xa5Gs+oeWlqWimpmq wa9w== 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=zh0dmpx7aBWGfGPIvlj+VZ6GqPc6j7TpehU/rNh4LkM=; b=CHvi+JEgLvrsoSacEnf/uaApRM5vqK62ijuxGxXVyRCnPMa6ugcnPs5BvHRVBpwCD7 7E0S0rt1cZkHwU6KzHvzZsWi/N5RTJAcFfV8eS+S8q4hAXG8DLKkFfQS5MrfMLK2J9uS 3ymm/J5tMDoEXfzMlCkOgbwS2oX0/9dDpjXgGb7xLnvjHXpyNdiRU/VOpC8j37nvV4hi UOWhliLS+GGThw/TPtXkMdXX1UCE78pVzaOTa+D4BGtvEUoHyn5ZvqNooLJviI/Yh6ee Ed7h6UDH0S9JhLxpHtqABPbKaxn/cbn39dIOk67GYiSWcB+fV67L+j84KvsOKRCwX132 AE9g== 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=xW0KkqJ3; 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 ec12si12354904ejb.68.2022.02.23.06.30.22; Wed, 23 Feb 2022 06:30:23 -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=xW0KkqJ3; 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 6F02E68B262; Wed, 23 Feb 2022 16:30:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71CAD68B23B for ; Wed, 23 Feb 2022 16:29:55 +0200 (EET) Received: by mail-wr1-f46.google.com with SMTP id s13so11413143wrb.6 for ; Wed, 23 Feb 2022 06:29:55 -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=wzr/7BF5Vh/EQkyHpjdQQi0d3wQRpVCNM2mknAYJXzU=; b=xW0KkqJ3CphD/qxP6bkW0Tplq72bsfKBXb2++oCdGSzDj8zg42Ty9jyFHhnOe2Y7vz RdZsTZr3AfuoNUIOOg9YftZtNBh7KzRsBVbD3mwSmhi0BGBvLgCWFR/uFMhV05VuRGq5 xC8brptUZ4b7Hr5gZ6HWgVsBFPAkwUvFsvWtoEp2rc4RrYoQ+DLzg0/HDaQa2JkeXzwG HbLLMlQsusgVMhFsK+c6MfCyIiDTwj34/I3Vl4hG/aCspkdzM/+/HzuDW4wgzOvQrZw/ BHIDhL8JEJWgVQs+i1kyd5aTTmkxasBr5y00h2fgNUaHx/oqHTODbirjH3CIpS89mxbt 4duw== 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=wzr/7BF5Vh/EQkyHpjdQQi0d3wQRpVCNM2mknAYJXzU=; b=E0fbMASdiM28NRH76cFkm8+olgfSDVRbcZAXqCCkY1x4rHVhIOTaNsxKqo8Spz6sr3 21/pLSZlnu5LguIhFbaqRDHrFhrNVbu/Dc8pofn/hAQfv1BkDSsZQOZf+VciBSQbjKJU GIbeupcSQT1NrK6dwQlSJQl3NZEOEhqYAkVuGMF3qexbqxmxH0o2/pnlJHanChDvBUdk HVohEzSeuB7QXTMKXT+T0wI9dGh+7Jn7XlBZsq7bSNx6DGGJT6kmFVkRWzekHWAaRTro J+IE1TGdqYI6YKi2shoAhhOuXGyVOT0RkxZ9FIBjPg2efaau1NnmarBBJ7B5RPtvAKiv xZ1g== X-Gm-Message-State: AOAM530aTWOj84gJvx9fA9Ahpq3qkdaJVc3/LmGcSacQPuENxxiLekMr gZXPEL9wDmCsv73vwxj1iwPDXaJ58wBSkwLP X-Received: by 2002:a5d:4e83:0:b0:1ea:99dd:d335 with SMTP id e3-20020a5d4e83000000b001ea99ddd335mr5777569wru.16.1645626594887; Wed, 23 Feb 2022 06:29:54 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id g6-20020a05600c4ec600b0037bf934bca3sm6936807wmq.17.2022.02.23.06.29.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:29:54 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:40 +0200 Message-Id: <20220223142951.40366-3-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220223142951.40366-1-martin@martin.st> References: <20220223142951.40366-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/13] libavcodec: Remove unnecessary includes of 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: Bb9YtS0ycGnH These files probably have used defines like FF_API_* before, but no longer do that, and doesn't directly seem to use anything else from that header either. --- libavcodec/mediacodec.c | 1 - libavcodec/mediacodec_wrapper.c | 1 - libavcodec/x86/blockdsp_init.c | 1 - libavcodec/xvmc.h | 1 - 4 files changed, 4 deletions(-) diff --git a/libavcodec/mediacodec.c b/libavcodec/mediacodec.c index aa14624fd0..33bde8112e 100644 --- a/libavcodec/mediacodec.c +++ b/libavcodec/mediacodec.c @@ -35,7 +35,6 @@ #include "ffjni.h" #include "mediacodecdec_common.h" -#include "version.h" AVMediaCodecContext *av_mediacodec_alloc_context(void) { diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c index c829941d6b..8ffc58e1d8 100644 --- a/libavcodec/mediacodec_wrapper.c +++ b/libavcodec/mediacodec_wrapper.c @@ -28,7 +28,6 @@ #include "avcodec.h" #include "ffjni.h" -#include "version.h" #include "mediacodec_wrapper.h" struct JNIAMediaCodecListFields { diff --git a/libavcodec/x86/blockdsp_init.c b/libavcodec/x86/blockdsp_init.c index be3eef0021..44ac97407b 100644 --- a/libavcodec/x86/blockdsp_init.c +++ b/libavcodec/x86/blockdsp_init.c @@ -24,7 +24,6 @@ #include "libavutil/cpu.h" #include "libavutil/x86/cpu.h" #include "libavcodec/blockdsp.h" -#include "libavcodec/version.h" void ff_clear_block_mmx(int16_t *block); void ff_clear_block_sse(int16_t *block); diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h index 78ec4530c2..52e70c0d77 100644 --- a/libavcodec/xvmc.h +++ b/libavcodec/xvmc.h @@ -32,7 +32,6 @@ #include #include "libavutil/attributes.h" -#include "version.h" #include "avcodec.h" /** From patchwork Wed Feb 23 14:29:41 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: 34476 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp890199nkx; Wed, 23 Feb 2022 06:30:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJyax5V6PMGHCseaQulkbQNZOyFB9PMnGM/uiY4V1+Q4tt2WPBm6vREXWDpzS+9Kxj/SF/ZP X-Received: by 2002:a17:906:86c7:b0:6a8:49fa:a3f5 with SMTP id j7-20020a17090686c700b006a849faa3f5mr23437716ejy.421.1645626633815; Wed, 23 Feb 2022 06:30:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626633; cv=none; d=google.com; s=arc-20160816; b=ELC5h6ux4DXAb3Eo8/bbhnu6JBcLWWzLy0TqOKSH/f79uBBH6l1BA56dOEQqImEbzQ EVKqIplJoK+Q8t+0M/+sKMikRvJzshkItIbk+NMeEOGyd+Nk4t2FmPkBWaRm5iX3MHk8 bJKu1skL6BnfBVjNue0Ap+ByB+x1OQM7ok40bGzkS2VUnEmK3hkbBTvHjPzhs0/5olHf OnXpIdMESOiRwpS5NswfAetiVF4grmLYIasHLrBUC+fkmrAr+HUFX/jkunHgqXH6iENu cZkhmx0VjcUZRoKkfHjryEZqhb5M9WjFMLCam6ZIFNw1SLZrfaw4xnU9nNbHpd2E6EPE aaCA== 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=aKSMgtUPfX8VOcXXlDflJTviwPMohjzP1mU4gw8Rsuo=; b=RDivp1onEpZvf5fvtNIpykb8DCQbGWJ+VS+CYLTJWxxUoxkmRK6qA0CtpPhnW/LpCO kS3JZnbXONOZCRjd4tWUApUNFpMSydrmjR+AiwGAD/yo3O3TWNZsLBB759yDxIMPU3F/ SJTPB5BxaB5rOEXdx8SXMsu0ufxM8bBHDxXs7v/PiHwh+XxlFAfnfPLp3aIsKt4Lcz0X ws5SFn2OJ0PO49f1qVMch/z7opgQFQVZX35jUf/amGVaDMYSYpamsP6P4pd90GhuQmYc T9WcOFI/zD60fDDuOubInW8kzZ+KZ9wwjWOCSgCa1M9QVoznuOQXEU4LBbutkl6Wl8pG qTjQ== 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=JFVEYkcb; 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 e7si17460809edk.407.2022.02.23.06.30.33; Wed, 23 Feb 2022 06:30:33 -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=JFVEYkcb; 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 6587068B21F; Wed, 23 Feb 2022 16:30:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DEC8568B12A for ; Wed, 23 Feb 2022 16:29:56 +0200 (EET) Received: by mail-wm1-f45.google.com with SMTP id i20so3481901wmc.3 for ; Wed, 23 Feb 2022 06:29:56 -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=bM/6NNJG+GD9EGmkHJ6m/fB64pRHtNblPASg6MnTXN4=; b=JFVEYkcbv5DpGbIUYR7c5/CLmFXdy056twtzNT5CtxsUU0IAcjAUBou4NpGkEPpjIb FPZ9bf75MH3ggar8Q1a4p3VfUa/jxhLAgrPEwSrZWWN6QCoFRLhgzWtTntF7+iT/IDJ+ tG+YxM9HoaNfJKb2DpmVBtJN5yxCf2DLcfvtlXZwiBmTmPeL2zzkZ006lQ/0i4aG7rrP cluyFcyKeNLD8615jAhbANjuzS5hN6oi9yYzRwlNZvYiSmRApRHAT1hP56hfLyO8Md1u n8UGGvYdYGYP/BEvlUWSqEXNoMgrXyHsO2AboTntRV9iw4vMvuPNdwj1KPRxecydcDpV oY+A== 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=bM/6NNJG+GD9EGmkHJ6m/fB64pRHtNblPASg6MnTXN4=; b=MPD7tm0/N4mZgk9UvcjbPrdP1D958TgyX4o5m3MGNfYOjhURB4eFkugQ5Zix9NYgg0 HrhxD3HJEU3q6O8O+uFMirMgNmeWek1fr7pDVEHYDLFlubkdrEv3d6TCgTdzrFwsA2bt FyAIUJV7kPi+Le0iVf8DmF58G+fy5zfeynS6AGOMXlkuLGLOV136hd6H/+3cqLc9BJi+ 3QON0GrnsbrlxXzpXG8XVqG444gf6ewlUY2GdAR1cjAWXlmJKdkHS5C3LK6QJJKNPWqd sKvPL1rtRNdXOXiyTDNQB4tYWj2pDNQJqd/VUF6F16oz4iiQBfA9mgYN1+oDLmnlMJH0 dL4g== X-Gm-Message-State: AOAM533/Gb8sIA6Tr1zpCfDw4RmWF9WWovAUffR+LKg3cOdavHkTd8LH EcWiehb3MNd5+GT9wC2SMn/s6TYx9c2nRXLp X-Received: by 2002:a05:600c:4e47:b0:37f:d688:90d1 with SMTP id e7-20020a05600c4e4700b0037fd68890d1mr47253wmq.18.1645626596277; Wed, 23 Feb 2022 06:29:56 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id o3-20020a05600c4fc300b0037bea2f9775sm5893495wmq.25.2022.02.23.06.29.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:29:55 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:41 +0200 Message-Id: <20220223142951.40366-4-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220223142951.40366-1-martin@martin.st> References: <20220223142951.40366-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/13] libavformat: Remove unnecessary includes of 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: dVBtzdNpKBHE This header probably has used defines like FF_API_* before, but no longer do that, and doesn't directly seem to use anything else from that header either. --- libavformat/url.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/url.h b/libavformat/url.h index a129150d76..3cfe3ecc5c 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -25,7 +25,6 @@ #define AVFORMAT_URL_H #include "avio.h" -#include "libavformat/version.h" #include "libavutil/dict.h" #include "libavutil/log.h" From patchwork Wed Feb 23 14:29:42 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: 34477 X-Google-Smtp-Source: ABdhPJyHo5Q9EMLcitPXPXXxLJtBZqYK/+UnK1CN+DxEM/+BbRhrRxKIT2mC2g4xmwgMk/JvuOrw X-Received: by 2002:a17:907:3e94:b0:6d1:d64e:3141 with SMTP id hs20-20020a1709073e9400b006d1d64e3141mr2475ejc.213.1645626654567; Wed, 23 Feb 2022 06:30:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626654; cv=none; d=google.com; s=arc-20160816; b=gXc7X18nqLIeukGEWN47FK+OcpNSSmdVIwDsr0jErzQaKYOHruhaSCNyQXHT4TnOtG fgmi0i6D0E4h+l/Nuw6544A7d24ejeHJMtpcpFSVCCrfWjNqc2JcMaaM5CKH5xAZXXYs 4QbapZkOeDpTegluEcd2Ou8Zpx6BTFYJSVB6nrtkSW5Frwolik0+q7p0mjU4MIITdM19 FJRTc7EweDA/4DSJprDGVoIE8IxANY+ZqjiK56YzZc/jk/bfvwMzyWjlwdZQrUD2+Cqn HetjzVr+QA12izso9GcLjQyJlV6YFWWwLbmDovHJSklnyhDO+rH3Z20LKbazDQf43n+N edyg== 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=eFTWITf3Bsp8rQYodF+fjW8hUz4U9Nar6w1lWrgxbl0=; b=oPnJ8W/3UuiJT+kRpXLNWJoca6e4e0Z2r52fO02GjQEgytdoGMtOnZYS/lAoEADjCL gsqcX9hm8GMXXn1iwYdPyeGOyCxgLtXwsrjqpea6UvNly5zrVG5DniVwdlUhnxwvu7oE /VxsTTKrn5Xo7wjW2QkNRWcSUquGj4yECCCm/AuDtqJRCKQ0gzoO6hb1aYv6YyLLLxMl p7eOZGlWn6s2hEzpENUSt5R/FQ1eGPzOUo/Ll0Tby1Tw4s7WCSUC3A9FhBWaDgBhYtFA 9vYn987B4XHzFvfM4VYPFRN4uqBs7MisKdade//Qavhrmbq6FSlS4EX9vHS8+KYcJMT+ +AtA== 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="COD5p/Y2"; 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 u10si14576123edy.107.2022.02.23.06.30.44; Wed, 23 Feb 2022 06:30:54 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b="COD5p/Y2"; 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 6094E68B279; Wed, 23 Feb 2022 16:30:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58EC468B25A for ; Wed, 23 Feb 2022 16:29:58 +0200 (EET) Received: by mail-wr1-f54.google.com with SMTP id v21so4673457wrv.5 for ; Wed, 23 Feb 2022 06:29:58 -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=K1zyYZjaGi9Cvb8zDnmxxbljOuJ8nBNwVscRi5Ez79Y=; b=COD5p/Y29N49IMlRiN9fIa6KHkpc+fbDLcFNM3MLy/wiSBcNXl6LvYm7/c6WSURTBE DhjtyimnuN/o6rN0HYNzab2v/AKv3VUk+RO/RRRJCyCS9IJI0f6mldkxrGLZfg6Y77L0 sHQqwSx8a9EyPw0ZMTXfk6dMQLheLWVq3y8x6ovoWq2RzZDV6uCddkCSIEOWau4daFnD PClZseZmS/6+3BHRe5+8jaOPjInqrZv+vyPJJw2JPZqh0X2Xlg2btIVFMPFywznW3w96 xVRLsDETdXVxT2++3MMTanQCT4cj8lMRGQbDj1WEun5vmf0fmk1aslPuuhOrrKmjqCrU xTWw== 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=K1zyYZjaGi9Cvb8zDnmxxbljOuJ8nBNwVscRi5Ez79Y=; b=nCINbKHvaNTdjBK63VApen0XFSHLuAJGUXJLcEIYo54JGPNXujyldQuEmf6MtvsQxE Xz/16U5co8CJm6VfefaPyOdCX/SNC3uqTIRsOP1BCE78v9TiNzW9Q058vS36gCDDGm6J +XXrLsuFPY/3vFlsv4bPQpxgJPD1GTlbx2n/DpT710tjUFsG158dM95Jdw3GISvkcWn4 rFXaxlTN5vSCwjllWox0u7B4OSJszGezNYLlzZxLdSKKx//warjtGnXv4vQUpPXH42st 3End5mxYyV1rp1MTJEW5y/mECYC6JZNdoxqRklv4glo9MKny7v3cjaY5U7JtSTg5i7wg X+Eg== X-Gm-Message-State: AOAM530K21fdSEe2obWEleXwId2tK9dkZ3sP0hEVrQJUhdUQwQIRwWGD hqV5x8x+qGPvGvQ/YwGI2aMrxfDKsppZsQ1e X-Received: by 2002:a5d:6da8:0:b0:1e3:c0b:153d with SMTP id u8-20020a5d6da8000000b001e30c0b153dmr23016139wrs.658.1645626597910; Wed, 23 Feb 2022 06:29:57 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id a2sm5544017wmq.38.2022.02.23.06.29.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:29:57 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:42 +0200 Message-Id: <20220223142951.40366-5-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220223142951.40366-1-martin@martin.st> References: <20220223142951.40366-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/13] libavdevice: Remove unnecessary includes of 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: WR2SgLWLxSPe --- libavdevice/android_camera.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavdevice/android_camera.c b/libavdevice/android_camera.c index f089d1b6f9..1934999c18 100644 --- a/libavdevice/android_camera.c +++ b/libavdevice/android_camera.c @@ -43,8 +43,6 @@ #include "libavutil/threadmessage.h" #include "libavutil/time.h" -#include "version.h" - /* This image format is available on all Android devices * supporting the Camera2 API */ #define IMAGE_FORMAT_ANDROID AIMAGE_FORMAT_YUV_420_888 From patchwork Wed Feb 23 14:29:43 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: 34480 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp891063nkx; Wed, 23 Feb 2022 06:31:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJxDShr/wdmG9GooLDXLF6mL22YSPFE+m6s8kcKEf+0i8KTReeytEuoErVL8hAsldu2nUJsy X-Received: by 2002:aa7:d949:0:b0:40f:2aa1:1bd1 with SMTP id l9-20020aa7d949000000b0040f2aa11bd1mr32192733eds.284.1645626681974; Wed, 23 Feb 2022 06:31:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626681; cv=none; d=google.com; s=arc-20160816; b=TboeFBsoZrfa3dPAB5gMdjUmHl4h2Li07g4IfIYIbpO7gv7vb22qiByd0P3dccPgO0 JN4nWgNh3KSsstEjq8cqQvHje5l4qCdBsd7plbocW5bm1qmlSTeRcKLwn4YW5+KYGnz+ 7SIdcfS1dmGLYU7IGK3GKpW0SFSfpXS/hF773YQsZAxh7XYeX24yTQ38rWM9sdkF/J1n m/bS0mZVUfDIWH7AfxitA+GFjoD2Ig1VdJRlYvkT56NxsJDXFaa0Nb2ByLa1BewwgixP vhCSoaZk6yKgTNtjTja3Tsq+zlB1NiC765suPyKHDIp9U2dP/vxJ2my9T7f2XkYTXCb3 6e1A== 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=IwNQFoJqucuM36brYEPa0NX4jrERsCkIxFXKXfjCqQ4=; b=dkZ+JexfMcyKxS444S1+9v0plFYr1YUode+oKVXObJPRkUVF5yCokGXrwRAyHvOvJr Ys+YhH4PypbMu+NYuQ+W2dLkEmRRQR3lXDglFvxR5jLYxFu7Aua+9aFVme727ASMpNy1 711u44sCaJwoqrDtGnoHYTmF6uPtfh9IAudp5gGd15pTbM2B+ZCzMfaM7Zx6ft3gxlep 2QZT3DOL2s4eSUtgplhzi8dS2U1H/Q5iY29LFiEJp4+Y44WLVh0KuNYjof1zNahy2ITs BK+OrLnInbZig/42fXhiTcpwih84OX/mVXuNQdxV3l9OyCGKsTsQBkZLyYYlVu40so1G WATA== 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=jfweAoFX; 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 7si12947951ejh.752.2022.02.23.06.31.08; Wed, 23 Feb 2022 06:31:21 -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=jfweAoFX; 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 3852868B2A4; Wed, 23 Feb 2022 16:30:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2CC968B274 for ; Wed, 23 Feb 2022 16:29:59 +0200 (EET) Received: by mail-wm1-f47.google.com with SMTP id i19so13850924wmq.5 for ; Wed, 23 Feb 2022 06:29:59 -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=6UqXmh9qvEmC4GZ6uHk4NUtcbJD1k0Y4LZ1vnh71Iuw=; b=jfweAoFX9YTvpoPy6oJ8swPuP7Qom0i2+qMILrTwFIOT/jfvMsMHo38fa/+bSAjlSq WbLU77lT12cN5+QGKisWWMr5p40V4DV42z94eNKNOYYJ1WQqWHDjXrkVXr3J8YGPNPO3 gw7Xw4lnOvez3mBVRpvQK1P6KQhro6SH2X7luWdM1bEHtIt6JJDjc6xbm+FSuDgmUn6f aitgbe3Ke0O1sWGorQVHlvnpBODbIvFWp8BkX8aqzZfcRUOz7UX+eyi93GBnAEH9hcom NVJzNc29N6QGONJy42kR5njSu8flbqo0hgYg2qL92R40xSwpoqpcY/5yR8yaP9RTnMBN 5NRQ== 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=6UqXmh9qvEmC4GZ6uHk4NUtcbJD1k0Y4LZ1vnh71Iuw=; b=VKfLZfxRC6cfpg4Jr9GN7y66KJMR+2YWywwsBvlUPTbs11Mbl8jVzzpZ6/X9V4w4k4 eXKnBgEp1EMnWM1iyfu0KVrV3YSBa14jHoRi2HOrtk2NP6SFJ/iX+4mm2q8b/QmNLGuz ALwA1rb5YqMM618921d9PIzXEGieE406O2LjUyKBkt4x8dWMcRM8TykjxSO4GKtDuJ3O BhqfAV7CO6U22nXFx71YzAMFZWZ4sdMJ2FTKTYsY4K4074IYtzci/zEp4dvEtKGlEBKr 3fKuQDI90ROPmJCmPWGB+vekBcl1zv/75gEbpOL8Eof7IAAqzkwbknJKZsWW6zLJ/X67 fTIQ== X-Gm-Message-State: AOAM5300yn37iq+lKwsjxw5AY97CeBRQ1aIJDQ4gjlkJNNSqqtrGfPVF mo4GYy4H8QqBs8OdbIRAccAtELFFUeS+2HA6 X-Received: by 2002:a05:600c:4e12:b0:37b:ebf6:3d17 with SMTP id b18-20020a05600c4e1200b0037bebf63d17mr37997wmq.44.1645626599120; Wed, 23 Feb 2022 06:29:59 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id 20sm5553181wmk.26.2022.02.23.06.29.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:29:58 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:43 +0200 Message-Id: <20220223142951.40366-6-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220223142951.40366-1-martin@martin.st> References: <20220223142951.40366-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/13] 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: qnjFqmx8VA/x 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/version.h | 28 ++--------------- libavcodec/version_major.h | 55 ++++++++++++++++++++++++++++++++++ libavformat/movenc.c | 1 + 21 files changed, 76 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 7beea11933..6f48168477 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 38b7e7e00f..69dedead0c 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 6076b4ad80..dc413c8ac6 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/version.h b/libavcodec/version.h index d900503954..da6f3a84ac 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 21 #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 Wed Feb 23 14:29:44 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: 34479 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp891044nkx; Wed, 23 Feb 2022 06:31:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJw1hU8utnbKz69fMTpC+4ioPLakxFTgIoq9l0xQfzErNtOnRHg9vCeE9Ez/m6yYSMywFUjJ X-Received: by 2002:a17:906:3152:b0:6cf:d100:a8b2 with SMTP id e18-20020a170906315200b006cfd100a8b2mr23250372eje.529.1645626681187; Wed, 23 Feb 2022 06:31:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626681; cv=none; d=google.com; s=arc-20160816; b=xS4XxSAiKD/tVtc7sA4tTm05WCmVqFMeC5sQeEihKvDHeI/09lmnz520gD76e1oXt+ +CdeffcezYbjPm4bkV07cCLhQZn8kIDU1ViC1YvKWahXjYnUnQlX6zC4siCzO705eAGu TCsdLqDMasVovKes9++g2N0yd0jLOFR+uvG5+Ddrx3OZWvQzvk91d3Ou18jjTErlh/Pw 19CjqfbnJD2xaFv1PZQAGv8ajAatRLnLiEisNLWLY+KAYFbCMY6SJDmQpRgtRbW0W1Wv vS0o7+Dgq4jEJAiLR6r3rfix8VC3fDDZ0BDdhT5Jqd4o6t33i19cWKUgTpTSWAyxugNp yukg== 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=JoZZkCaDvAPHf69dllFRSwXiMwEzSwJQVmoi3gJ7bAQ=; b=clOeagTCRnPHPVE52WuHz14QvTwZN9w2R9R6OP+WQ5a2PbQt2wayOIKEiSFI1IeJdz f5D23KC69SDzAfbC+tOKogC1RcHbD/Dxs4NPTE6jDY3pWEP7R6JqwrYroQQGsjmw4Vc6 nrdWEtDSd//pplnzFkFMDYjOf3UmT/M6mBYhevF9nN+4Tk79VGWV5r8BtbyQUA4jSlLA IOjSa1N2x874Sd5RCyAQz3hjFff/XCZFT9USwbY/BDrd5nYtZOcV4V2q+GUWleA+NuGX fWNgyFU0ToML5V0GerH9w4dsCqedoPn6BHYqiqTDVoBkiX9FKuBjWQfHtDMZ41ky2NpK BMZg== 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=tEiw1D4H; 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 fy9si5981071ejc.279.2022.02.23.06.31.20; Wed, 23 Feb 2022 06:31:21 -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=tEiw1D4H; 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 4DD8568B266; Wed, 23 Feb 2022 16:30:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1944A68B28E for ; Wed, 23 Feb 2022 16:30:01 +0200 (EET) Received: by mail-wm1-f44.google.com with SMTP id n13-20020a05600c3b8d00b0037bff8a24ebso1658872wms.4 for ; Wed, 23 Feb 2022 06:30:01 -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=srlxNhVBsnYhYvxs8LrzQrqX1xVUbInFiYd0yAuhIJc=; b=tEiw1D4H8x7MRoI4jeM/oa6E0tAjBwKaOMs1t+DUSXaLSpGjmx+okPc/0akECBDHDE +d4D5Z9SMoLlCNQszraDNIcFMxIxy5nokaJkEKyhXElD5iU5//3s6NvIY1vhwgEPnNEu QV7fVd84RG0uisRBQ1xJpf+q/rv1LbXWREa7hopXwlRT6R+jcvKW5+AVgiSr+ZWQJkgo yuSyj2Wt780ytgSTyW8/FxwT8Z7p7jrCE3Zd63i11UDHTxHJy1Yt8e9u+h4UF7z77YLb /FzByvBxc6bSL31sP08XMUGrUFQaJOrEXzLIM18tmc0BSokER2XmL49rWQWw1zFeuILZ 7RKg== 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=srlxNhVBsnYhYvxs8LrzQrqX1xVUbInFiYd0yAuhIJc=; b=20G/e85TrEWlGpRBv82PkP+qCbFSj192SUuS57el11XVygQs4xzg/dTvlMVYLNMiz3 P8d8L/e9N6p7nCLHeDZmd4XISg/FYnBJWMR7hjXT3Cll3bW0ur9A+RtGvanoJdTZiJCv iu+SEE+OZWXljg89kBMxbkUuJKPI5gm0/owv4mf8cm6nNIyN2Mh1REhgSTL2EFuTte/k fu5BoWIFhBESjiCljLAzxq88jrjtLox9YVdaljtncSgQHUJlujAGGkdUb1BHokN75zQK 5+QUU7QeOLii62OckxeUP2EgxL30Jpp2mw4U6R0HoOiWvAj8yyWm/kqn5QLaoZk3xfd3 qlGQ== X-Gm-Message-State: AOAM5307Plh+Y4OqeSdYXxgyJxet/3osfKnBKnZcRRm6/1YLy7JSesuM JIXjRoZ2jiqoxgUJRV+qmKu/KqS8MQCPBNlW X-Received: by 2002:a05:600c:4f54:b0:37b:fe6a:ea9c with SMTP id m20-20020a05600c4f5400b0037bfe6aea9cmr7829975wmq.169.1645626600536; Wed, 23 Feb 2022 06:30:00 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id h2sm5622904wmm.27.2022.02.23.06.29.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:29:59 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:44 +0200 Message-Id: <20220223142951.40366-7-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220223142951.40366-1-martin@martin.st> References: <20220223142951.40366-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/13] 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: 90WG07RV/jOD --- 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 | 52 +++++++++++++++++++++++++++++++++++ 22 files changed, 74 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 69dedead0c..8f5aa12600 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 6566e40cac..dc4bc06c5c 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 cd63322a62..a7a0fbdead 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -32,7 +32,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 26234573b8..30dd63e590 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 17 #define LIBAVFORMAT_VERSION_MICRO 102 @@ -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..b4c3550d50 --- /dev/null +++ b/libavformat/version_major.h @@ -0,0 +1,52 @@ +/* + * 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 Wed Feb 23 14:29:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 34483 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp891598nkx; Wed, 23 Feb 2022 06:31:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+rEqefkv6MKmOyZkaPDMdU8JkZK5rl2lYfinEXjXXzHeW/KAdAp29BkmHnc+aUbD5OK7v X-Received: by 2002:a50:baaa:0:b0:410:a098:2a7f with SMTP id x39-20020a50baaa000000b00410a0982a7fmr31494036ede.53.1645626714679; Wed, 23 Feb 2022 06:31:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626714; cv=none; d=google.com; s=arc-20160816; b=d8sftS3ppikV//4gR82Rknq0fmjNcHotqJgOSK6l7NU/R/CSVclam4bTC90e4WGspj a5f1YDGQM3OcNmzAlLFQHisNmitPMCOo/oS0MG8SD8Fb9DiOHirhyf4auTkSpAvScEUU JuyUNS3U9QZJkjf5i+S2ygJ3SKJqnkaae4xwY96j8RkypG/UgLcUWqJd7WNh04CQsyO1 AVG+aC+I77une5Fh1LGpD+SSMvHLYa395O4iPL8HIlb8M34PDy0TpB3GcuK34mTJOc/M aUANdx3FBEZvvXYNVokQyvcEFd/rAJEPb4WtuIcq3FLK3+YSOeWM/0EIgnguStWOpsx2 roIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=szKO4GnjaohJjhjAvLE8PK9OyRlEkgiFObXmu46Tibc=; b=D+SztnN12lTSKO16n2tcu1expYXOA5QN6ev8jFycjXo1qvUN8TP1H2HKgrH2cp6zUQ GPCPH3PwjVdpAaPlGKThRbm6J/XBDdmaehO+QFgHuqVQ7TdE+Yhk2wrHXTm+Ao09Dorl DD+POLuJFd6Nxdmosh6xvRw3Vjk7a4iV57MXW+GQqnfgPsXCHLYwk5OzJOH5TEyyp6va NE/39wbPc2JRVgne7fqLSh/TBPWNEqSlFSFYQURxRDRD0wNuBwS68KiAPaOetzQQjOgS 0Jbv3l9rEEJlnbp2qVFRr7rvjgDKY9QXRwPDUbGXHN/x7k9aKPXpjWaut1DxuqcA2+Q5 KWzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=nxdnZt2y; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f6si1594389edu.256.2022.02.23.06.31.53; Wed, 23 Feb 2022 06:31:54 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=nxdnZt2y; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E85268B277; Wed, 23 Feb 2022 16:30:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53E5C68B2A5 for ; Wed, 23 Feb 2022 16:30:02 +0200 (EET) Received: by mail-wm1-f49.google.com with SMTP id i20so3482059wmc.3 for ; Wed, 23 Feb 2022 06:30:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=C3jZMoC3gMheYJ7Ix925aGKwN3J0p3VN1s6IMxBah5E=; b=nxdnZt2ydhB823Sv6dwBpHE/7wssBJbpk9hsV+9toy93KPacJ/T8/wKAC8FAim0iOX AD5LPwvuMB7q6ufFR2+CfVD8rAsNrOB0NkLoC09arfF/Y7JTYwGb/sgTwQzmCxFs39oF G4FLi2YDuj5FZAc+sUtM557UTbr2wTjyU3FcQh/GAIM+N+4e2pucAvwQvE+koLTzUzAT 1dkjLGCtcvFOY5AXkJIR9rvF2SZ+3O5ol6esvI94PLcTghlkHugk68fPaVANsN384AQc UtVE7Wdy8MY2qieBrW7IKGkdLxOJUtC7ON4AH8YXFrvuTFjLzwN25yi8hN8YqxQXoDQN sZ3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C3jZMoC3gMheYJ7Ix925aGKwN3J0p3VN1s6IMxBah5E=; b=OKMkaTVKOgIpEgSj/gK9mmJNmonHwMlLyzrLcIMgHpNSWcO6kWYLHOUWobh4i4f/Cm 6qOazYcX7YrtmeYvvv5oQFE7PGEC8+FZKDo8ICCxjpSJbs29lSYKbjtgC1SLrpH1PUkV 9/am6G1GbPlbPg819n7zScma+bjG6XAACr2Iv+o/WB9iXDfXGayDPLhBvToz6VN+PvKE m0TWTgWg9HvuhWCvhJCsD9r/MHT3RtV1xmZx2rdrnCl2LLS2B0BqVTScSxHCtnHMtwtY 59SCb4Tpp6D2/5qmulfIfkcN16r5GaDF4JoCchSIa4CimZVPl8G4Dwc0gNoGX5aYlq07 oVRA== X-Gm-Message-State: AOAM531BfeD/8MIRabxXVIrLn4/jhod5TRzukdL0uUB8lBNfHKuTCXgv Wyw48JKqyyLgJHB+5vI14HbqrBUnrWnYVGja X-Received: by 2002:a7b:c341:0:b0:37b:c619:c9f4 with SMTP id l1-20020a7bc341000000b0037bc619c9f4mr7866332wmj.38.1645626601777; Wed, 23 Feb 2022 06:30:01 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id o4sm5926718wms.9.2022.02.23.06.30.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:30:01 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:45 +0200 Message-Id: <20220223142951.40366-8-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220223142951.40366-1-martin@martin.st> References: <20220223142951.40366-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/13] libavdevice: Split version.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Uct7JhBYOG1G --- fftools/cmdutils.c | 1 + fftools/ffprobe.c | 1 + libavdevice/Makefile | 1 + libavdevice/avdevice.c | 1 + libavdevice/avdevice.h | 2 +- libavdevice/version.h | 10 ++-------- libavdevice/version_major.h | 37 +++++++++++++++++++++++++++++++++++++ 7 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 libavdevice/version_major.h diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 87f410e975..21ec11226e 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -35,6 +35,7 @@ #include "libavformat/version.h" #include "libavfilter/avfilter.h" #include "libavdevice/avdevice.h" +#include "libavdevice/version.h" #include "libswscale/swscale.h" #include "libswresample/swresample.h" #include "libpostproc/postprocess.h" diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 8f5aa12600..0f4d14574c 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -52,6 +52,7 @@ #include "libavutil/timecode.h" #include "libavutil/timestamp.h" #include "libavdevice/avdevice.h" +#include "libavdevice/version.h" #include "libswscale/swscale.h" #include "libswresample/swresample.h" #include "libpostproc/postprocess.h" diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 53efda0514..99fea7133a 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -3,6 +3,7 @@ DESC = FFmpeg device handling library HEADERS = avdevice.h \ version.h \ + version_major.h \ OBJS = alldevices.o \ avdevice.o \ diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 8f460c7564..833d200054 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -22,6 +22,7 @@ #include "avdevice.h" #include "internal.h" #include "config.h" +#include "version.h" #include "libavutil/ffversion.h" const char av_device_ffversion[] = "FFmpeg version " FFMPEG_VERSION; diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 6f24976dcc..6de0e33819 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -19,7 +19,7 @@ #ifndef AVDEVICE_AVDEVICE_H #define AVDEVICE_AVDEVICE_H -#include "version.h" +#include "version_major.h" /** * @file diff --git a/libavdevice/version.h b/libavdevice/version.h index 05234e7f21..513c0bb1bc 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -27,7 +27,8 @@ #include "libavutil/version.h" -#define LIBAVDEVICE_VERSION_MAJOR 59 +#include "version_major.h" + #define LIBAVDEVICE_VERSION_MINOR 5 #define LIBAVDEVICE_VERSION_MICRO 100 @@ -41,11 +42,4 @@ #define LIBAVDEVICE_IDENT "Lavd" AV_STRINGIFY(LIBAVDEVICE_VERSION) -/** - * FF_API_* defines may be placed below to indicate public API that will be - * dropped at a future version bump. The defines themselves are not part of - * the public API and may change, break or disappear at any time. - */ -#define FF_API_DEVICE_CAPABILITIES (LIBAVDEVICE_VERSION_MAJOR < 60) - #endif /* AVDEVICE_VERSION_H */ diff --git a/libavdevice/version_major.h b/libavdevice/version_major.h new file mode 100644 index 0000000000..d255ff6992 --- /dev/null +++ b/libavdevice/version_major.h @@ -0,0 +1,37 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVDEVICE_VERSION_MAJOR_H +#define AVDEVICE_VERSION_MAJOR_H + +/** + * @file + * @ingroup lavd + * Libavdevice version macros + */ + +#define LIBAVDEVICE_VERSION_MAJOR 59 + +/** + * FF_API_* defines may be placed below to indicate public API that will be + * dropped at a future version bump. The defines themselves are not part of + * the public API and may change, break or disappear at any time. + */ +#define FF_API_DEVICE_CAPABILITIES (LIBAVDEVICE_VERSION_MAJOR < 60) + +#endif /* AVDEVICE_VERSION_MAJOR_H */ From patchwork Wed Feb 23 14:29:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 34478 X-Google-Smtp-Source: ABdhPJzDG5YjXGlrjNrXd+9XMG01mez1++4jUR/yE7MTvbbCl3GrSw9GTrQg1TxOPAwvs2m024sh X-Received: by 2002:a17:906:2a85:b0:6ce:36bd:bcd9 with SMTP id l5-20020a1709062a8500b006ce36bdbcd9mr26983eje.318.1645626674200; Wed, 23 Feb 2022 06:31:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626674; cv=none; d=google.com; s=arc-20160816; b=mMM/w5jdBW608y/A2b7ugrdM9+vziuIz/G8J+US0JULOC00jg2+Za/zsX4gyEsXpx2 vxpDg7Yv8otnpC0+tBshyhDP+aath1VewnlN1EtLUDxeLHrUBPlihvhqzJplofUpAqky JDor4Kl4Cny1jCBfzEYJTgw2lW27fexIkljqfT6WljMYDVAb/2pLqHv7KeXL8L/rlhM0 kAlwwtywL3t1Xq1r52r0ONnzdc4EEx1+7FCRWVWTI5Aoi2QeLKM7k927lBF1h8Y2h4Oc XRLZzQAw0U2/+bwtS+L41XoJe28E/38vqouJBUT/6MfywV8jdFND3ZrRyVLMQtdTYq9p Vnmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=XgEs4tCBxmmaoD9i/A6ilF3OcMTwitfarknwQsnKk1g=; b=AAXZrttf/uwxpzt46wQTc+t/MkMohAxANVTSCh9cJjHbYSw/w7gTDkdLydJ0C7js0e 1GfLfxZ9yNGFGR9Js7WIkHwnIiSBhtzpIyzN8TDtCU2Io6xfUI6j5lN8pttTxXJckueI qNnU0fSpUDr1kUaajRnQrnpX9oNrF90fyyGD9mycc/8y/gr6wrOp63yl2IsDmgg9wepQ KMR6xTgJBeJO9bvxuioEYhq2LY9HZFXrpu/w60NTOVnN3NFW2qBuCluox3/p5vgqtRAh PJ7WSh+uGxaHkCiAtibPKLtLWwzQcGttMPzkFgc+Jt3w07exwU1Jbd4VW4GXodIOYkw/ NgLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=zE2HNUJ8; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cf27si14366991edb.471.2022.02.23.06.30.55; Wed, 23 Feb 2022 06:31:14 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=zE2HNUJ8; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3524568B28E; Wed, 23 Feb 2022 16:30:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA4F568B26A for ; Wed, 23 Feb 2022 16:30:03 +0200 (EET) Received: by mail-wr1-f42.google.com with SMTP id q23so5217181wra.2 for ; Wed, 23 Feb 2022 06:30:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=r/3BlL/SRC0NCSCRSM/VpY4QYUGywZqqVQKKa7ozHcE=; b=zE2HNUJ8NH8OT9O7GTTO6UYcEV6K70D4ynjG+fJT4g4PrU8VF8YFbBn22AWb84Z1zq hOIuR2UehVdPioUzG8wc3vkxdpCicBhA44LsR/1e8L+UyASfZ9wiQz/nEzoajQdlpZ2D MonL3OGiZHsyVRFeMNTHHDbKKz7OhTqIn0WrZHgZrcy4uqEIm94ym0zrJ5K8dKBgn0kI 8ZqLm/luz2mkFpe6Khiq19wK3eyme2qTMEQMgg1teSQPp5tOQ5YAD8APyv+FHwAI66Oq ILt8tDpH8GEvmevyqu45gPWzh2kLHhBnhJvI8ii8OUBQX71tcadvv/nGYSt7ZpZtaDE7 hHyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r/3BlL/SRC0NCSCRSM/VpY4QYUGywZqqVQKKa7ozHcE=; b=BXQT2FO/YdowewqLRHTIDRaEHy5AbtJ1XEeQRwVRs0XsGEK/li2x7xTlECiHhhn0mO 2dqtlcj/xCHRrhFML00EM36vd4nl5cDkAqot/0R1ZidiqzhfaMeZDqjxLs8D6PtgrNak xwW7qFESidxu8VNlednqkWMC80xCD2BLpCg2B6uHyJXa57kq1JcR+s4T9de2ueV2ZK/a 3MgPzSQDF8eJVgM/GLVEpXj1qnij6ya05mubJxe+obA0FEwUbivfvMrfJI7JvxLj0jA5 0hip7f6HPlDqVFbW7UBqcJo9+OY+3+lMdNxGFeqOXC473A5tGdPLvBeZzbxW3lrNVmLS RvSw== X-Gm-Message-State: AOAM531Ez1q5Bl4AXVXIplqWAzQCu00XppWwXTImAGOLxxdcTsxyouvd QkoQpqxMqlnPpUOOeQcJdBaJ9ZmLgBjcOTh9 X-Received: by 2002:adf:d20c:0:b0:1e5:952c:34b5 with SMTP id j12-20020adfd20c000000b001e5952c34b5mr24206010wrh.82.1645626603087; Wed, 23 Feb 2022 06:30:03 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id u11sm59417218wrt.108.2022.02.23.06.30.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:30:02 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:46 +0200 Message-Id: <20220223142951.40366-9-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220223142951.40366-1-martin@martin.st> References: <20220223142951.40366-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/13] libpostproc: Split version.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bdIIbXxM6Bxl --- fftools/cmdutils.c | 1 + fftools/ffprobe.c | 1 + libpostproc/Makefile | 1 + libpostproc/postprocess.c | 1 + libpostproc/postprocess.h | 2 +- libpostproc/version.h | 3 ++- libpostproc/version_major.h | 31 +++++++++++++++++++++++++++++++ 7 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 libpostproc/version_major.h diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 21ec11226e..f52015708c 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -39,6 +39,7 @@ #include "libswscale/swscale.h" #include "libswresample/swresample.h" #include "libpostproc/postprocess.h" +#include "libpostproc/version.h" #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 0f4d14574c..a0b9854004 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -56,6 +56,7 @@ #include "libswscale/swscale.h" #include "libswresample/swresample.h" #include "libpostproc/postprocess.h" +#include "libpostproc/version.h" #include "cmdutils.h" #include "libavutil/thread.h" diff --git a/libpostproc/Makefile b/libpostproc/Makefile index 34317193a8..f7debb8eeb 100644 --- a/libpostproc/Makefile +++ b/libpostproc/Makefile @@ -4,6 +4,7 @@ FFLIBS = avutil HEADERS = postprocess.h \ version.h \ + version_major.h \ OBJS = postprocess.o diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index 2ca7a3779d..b954dc2eaa 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -89,6 +89,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks //#define DEBUG_BRIGHTNESS #include "postprocess.h" #include "postprocess_internal.h" +#include "version.h" #include "libavutil/avstring.h" #include "libavutil/ppc/util_altivec.h" diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h index ba456cf3e0..cf4e78c83a 100644 --- a/libpostproc/postprocess.h +++ b/libpostproc/postprocess.h @@ -34,7 +34,7 @@ * @{ */ -#include "libpostproc/version.h" +#include "libpostproc/version_major.h" /** * Return the LIBPOSTPROC_VERSION_INT constant. diff --git a/libpostproc/version.h b/libpostproc/version.h index e8bd6afdc8..4459d251d4 100644 --- a/libpostproc/version.h +++ b/libpostproc/version.h @@ -28,7 +28,8 @@ #include "libavutil/version.h" -#define LIBPOSTPROC_VERSION_MAJOR 56 +#include "version_major.h" + #define LIBPOSTPROC_VERSION_MINOR 4 #define LIBPOSTPROC_VERSION_MICRO 100 diff --git a/libpostproc/version_major.h b/libpostproc/version_major.h new file mode 100644 index 0000000000..7afc4dbb72 --- /dev/null +++ b/libpostproc/version_major.h @@ -0,0 +1,31 @@ +/* + * Version macros. + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef POSTPROC_VERSION_MAJOR_H +#define POSTPROC_VERSION_MAJOR_H + +/** + * @file + * Libpostproc version macros + */ + +#define LIBPOSTPROC_VERSION_MAJOR 56 + +#endif /* POSTPROC_VERSION_MAJOR_H */ From patchwork Wed Feb 23 14:29:47 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: 34481 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp891316nkx; Wed, 23 Feb 2022 06:31:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJwhNusohbw28SB2JEeCF96HJTMuAtcXjHWgfErbl6TqdmCWa8tUDR9eroK944nQMylvUejQ X-Received: by 2002:a17:907:9196:b0:69f:2625:3f2e with SMTP id bp22-20020a170907919600b0069f26253f2emr23128473ejb.575.1645626696206; Wed, 23 Feb 2022 06:31:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626696; cv=none; d=google.com; s=arc-20160816; b=v5XDvfbo9plZ9a+8uA2gG0FLxsX9LrXtilQIFUAUl0zoDLT7eoI/q66++8033JLHrP pK39ZxLOYOH+isZKhbahKg808V75cARcoO52do1+8FXpyRBUIuVy8RMJc61gVA0I4PfB cIHqI2QEdCIA0DAgjAgx0g1FktTM8DVAr5cxnRzSeo/Z3qGGu3Qf/u1gKkpQsGh2sDvJ 3YwdcZwzj1Zg2YvBU24eVS2EcmM+AqmGgZH8NCMEDhXSGeNmNs/BQhFMgwWGcTOly5dK z4HZt2FDQ8RAHlgmr9tFUTNI8rSX4irou2X9foiyWYEvWm68FeHYQ7rmJm7dWOIIbGia tqlA== 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=VjXVupBab98Ec1ZdMfIiVp/Rg5FqVWLomOKeHvv4XOE=; b=fhgHBBnm3sijK02oPHKSsxiMm87pmUGkWlxLjyt7X8A2LwqgzxgsZ3Mf4NPFBs3UpX uItfWis0k62R2rAUiF//SVOthCSyAl0no4lUG6YUk7hhdsAj4/6cH6qsItV39ajFBiU/ qoRYb4VE+UQqTgg9HdB6XawkopDFYDL3ocFKpzkCnNU99E9t7F1WDUOK7FZA3/5iXpvW 29P5f7tebxTHuSK7EUycOx/el2bQPsViAmS/nQJUwiAYMZZSnliD//MIlB6KNn5UBG39 f/cjL/hqyQblJwJfcTkZPVuj1FJIOd+anQ//HwLGLy01KlO27B7JYvlLt1FdSe3VrwSz l89Q== 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=Jgit4F82; 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 by10si14916478edb.621.2022.02.23.06.31.31; Wed, 23 Feb 2022 06:31:36 -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=Jgit4F82; 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 50CCF68B2B0; Wed, 23 Feb 2022 16:30:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A8A668B290 for ; Wed, 23 Feb 2022 16:30:05 +0200 (EET) Received: by mail-wr1-f45.google.com with SMTP id u1so39917186wrg.11 for ; Wed, 23 Feb 2022 06:30:05 -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=8IJ+AC3NGF79AM+J1xdA/lzV/e/KAD0JhPDTKmEbbuk=; b=Jgit4F82ILQVj+TQ3Q3/jsXGbh86JCInMD2lOJ+Nh3Ed7u/1eNySlOJzPLD3w+m8Sb YOsADOXkDMBYnvv6KMOIhWEkqYUj9BfpSzwoAjAXqNxRVXu+M0HncA6LGjtdE8XbOuq1 TbsJwoeLFwXoqhGjOOC6gV342sFU48baUV/d7/p/X5y3B1M/Ay2mmrr8jB/b6mbiyNb4 bvBBFt70x/VepuZLnISc6GWZ200hkQmRqg63ZjtCyuga8AJHShmR3Nnv/aPfSOKE89iA iz89ML9Lq9EfkRKbgogK6+zdwBAOVzQBjp0wb+wlLywRM/GOTKgNmcmix37fM2MRVy/2 ns/g== 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=8IJ+AC3NGF79AM+J1xdA/lzV/e/KAD0JhPDTKmEbbuk=; b=13be5CLjzx/0sgjF55Xna2SNpdyPqhnNSK5Lf9/19Tst9g1ebga5opfIXqkA8ho6m/ v15dx1yQ8R8snJ2EfHyFxgktt1DCmC8mYgxyXuNFWDYeHTcmpZ/wYn6VeDqNVqg5g1pN /QefFvKPhJRboBZ43/5DstFTOkqa/VqcmU6zbmyGGMu/JWDBqDfaYaZzsnuITc9b9OLn UdvpY2M58J5Sd5SGPGsHJOajITH2NgxVbtP8RLkxr6iNM5+0RxBHE+gNqyDQ389l0/pK IjEgyexRDr9OGdQaxtlotta1YWGFkDcq/6Y2odsojGDz7R/zPTy6o2yTe7A/AOvM6pnr labA== X-Gm-Message-State: AOAM532rPzAkXZzIn/BeHk78qcH9CiKBFBnaEMeUYMvBNOiw6RPSvZG9 jwb5EyTCE8uiTXzyFxsPcOafbog90jCQ/wEf X-Received: by 2002:a05:6000:2a2:b0:1e8:6dd5:767b with SMTP id l2-20020a05600002a200b001e86dd5767bmr22849455wry.444.1645626604688; Wed, 23 Feb 2022 06:30:04 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id g6-20020a05600c4ec600b0037bf934bca3sm6937416wmq.17.2022.02.23.06.30.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:30:04 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:47 +0200 Message-Id: <20220223142951.40366-10-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220223142951.40366-1-martin@martin.st> References: <20220223142951.40366-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/13] 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: y5y6BEfYkCuS --- 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 a0b9854004..9f04354c7e 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -55,6 +55,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 Wed Feb 23 14:29:48 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: 34482 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp891505nkx; Wed, 23 Feb 2022 06:31:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsE9RsZO/XWvVVLGvhlQ91R2ZcC8+BUbHNVb16uH8HeI7LVsc+0XCP75/iVtsasiq1OjhD X-Received: by 2002:a17:906:1ccb:b0:6b9:f52:5c60 with SMTP id i11-20020a1709061ccb00b006b90f525c60mr23025579ejh.509.1645626709085; Wed, 23 Feb 2022 06:31:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626709; cv=none; d=google.com; s=arc-20160816; b=RRw0VUp+yi4McQ0z6QkWH3D2iuMeA1q5lzo7Uvx+iq61+AWMHD3SIyQpf29/+BucKu s/JKyKcb2N9feWimD0jVik3lsO0voh8O8++nC4ipCTsjPao3UyPYZFyW9WGf2W7sLP/t sOKT/0u+wQfZstpF+ppj+T2EgzqbIFacDpL7BwIry/5hCmt62Bv4pE8DXAIWClkFJqOh R+EoBKhXlUWXytmBtBpk2/8setJkai6HwBJ75UjEP4JowXQ5KmWHAA/753nAQPu60F8U M+sRsDA8hUFTsePqIblUj6sNYqIqne9pR3N6adRVmzo0RtM6p0kTdJpG8yOiv4WYyZ2V buAg== 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=PI9rjMMvEm3iJPTYtDOBFaOMpk2zapYTDd/gh9WyTGw=; b=XzidUk9mZV8YfXGv8mfQrI78DlYibeRd8LNFIBb1+Fyl04eUzVx+4ptErSHZpIHumY 7qOWlMq8boYEpfuEmc5mhCuzaiGKzJpkEKN+3vuUOqzO1cijLHSamO2l7eCPJgRKQ7eu 2cpZg4uOs7nbV3UWl8N7dAzUayCpfHn4nM1BVAYnhN9CYrKdnASba5LgGQNkJmNY8dVQ 547e/tTtMLVOTqDIKhYPU/AUvU47fZwibf2L7S+sJQCI+JI7bg9yb853PMbzZZnLT5jT mCYTtCXEtrW46YO2NziCQwApIAPspIyz+fuhj01wAFaTvVAJa0B9xqqZJcFhCxq6O90H z8/g== 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=lsw9mi3c; 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 c2si9423490ejz.640.2022.02.23.06.31.42; Wed, 23 Feb 2022 06:31:49 -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=lsw9mi3c; 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 5003E68B2C6; Wed, 23 Feb 2022 16:30:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CBDCF68B295 for ; Wed, 23 Feb 2022 16:30:06 +0200 (EET) Received: by mail-wr1-f46.google.com with SMTP id p9so39928347wra.12 for ; Wed, 23 Feb 2022 06:30:06 -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=FqEOmoV6HCI4H3pHuV308uy9XEcBeRpQfEeBOIXpeZA=; b=lsw9mi3cY6xPtaxjpI8GMjfmozfRfslB+WrJJVJvPAB8SuSnLhWvEdem6pSTSmxTmi CWcYQ1U6FrsWKG0odVoGU6QAwQ0purE5w7CkTRttNoODTRnDI3CJmtGichAfbefK66LH aTO22PYpoFdu5jUnauAd9/6vkac8+Erfv5PeXGzSb31aKWLk6086f96RDmb/ul1KLOGs rQkCtdv4OPbuaCDsalMRjNmYGJKdRFCbm/uvADWr13cKsECrknmUuRl+eRuNysuJLppr 1klefzicZgb9lc+cGRT3OjN+I8ohTT2SWQv3ceEjqcXTj6CuQ1XpXK31/YEfYPV/Ph0l OAkA== 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=FqEOmoV6HCI4H3pHuV308uy9XEcBeRpQfEeBOIXpeZA=; b=G30xNU7XwAmKP6RTGaoH9LPWkuhRvPTvPUK28LjCWNd2FrRN/jXDsLRkvOgt9U5z9Z 82Bi4HoG8uq85qFyZ3yApr/4Yk8mXEjW5d95Um5yStP9CG+Gyo3WGjOo8QdJHN+O5nVx bBd+MUH/iYLvvc7A/ZcfEVBqVpL4+HvDAq1fBHh+plH1ubhcpUqBO+ZykG8oe4hmQ2+q tx4/8ppCts2l2i4smx8UC0dFXoHwKjwAmX5hQpE29VXabQ2hcRAGmbqgJWbAJqxylTSz xMkWcSSVVeMmhm0Y8szSONwSnkuW8gbW5ONKYBOHJZJZz+FGeG3eVW36WhLs6o5oUCoZ vOIg== X-Gm-Message-State: AOAM5320waDJHOAjAZ/d5rBz/J/3ePuAhWW6Y+Gz92sBsSASC/NQg5IA RLFgnUAntX1G3xkDa9jkBzTZ3J3DedhzIFQg X-Received: by 2002:adf:e344:0:b0:1ed:9ce7:2d33 with SMTP id n4-20020adfe344000000b001ed9ce72d33mr4396719wrj.289.1645626606279; Wed, 23 Feb 2022 06:30:06 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id z17sm6216792wrn.55.2022.02.23.06.30.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:30:05 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:48 +0200 Message-Id: <20220223142951.40366-11-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220223142951.40366-1-martin@martin.st> References: <20220223142951.40366-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/13] 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: wse7sgvVKlSe --- fftools/cmdutils.c | 1 + fftools/ffprobe.c | 1 + libswscale/Makefile | 1 + libswscale/swscale.h | 2 +- libswscale/swscale_internal.h | 1 - libswscale/utils.c | 1 + libswscale/version.h | 9 ++------- libswscale/version_major.h | 35 +++++++++++++++++++++++++++++++++++ 8 files changed, 42 insertions(+), 9 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 9f04354c7e..2e74580ca8 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -54,6 +54,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/swscale_internal.h b/libswscale/swscale_internal.h index 26d28d42e6..3cf96d5fbc 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -24,7 +24,6 @@ #include #include "config.h" -#include "version.h" #include "libavutil/avassert.h" #include "libavutil/avutil.h" diff --git a/libswscale/utils.c b/libswscale/utils.c index 7c8e1bbdde..ee8e5c9364 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 Wed Feb 23 14:29:49 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: 34484 X-Google-Smtp-Source: ABdhPJxHc2eYgUzQ1OA/zITrCSWiqjH8K3FgbKPvYReFcNWaFG7Vqznvf2b2/GVqL0lwik8ASc/4 X-Received: by 2002:a17:907:6006:b0:6cd:efc0:3d67 with SMTP id fs6-20020a170907600600b006cdefc03d67mr42099ejc.32.1645626727774; Wed, 23 Feb 2022 06:32:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626727; cv=none; d=google.com; s=arc-20160816; b=VyVDLDn3iXpFg5JJq7WYy06rAgHKN5jS2K5TRGyh7R1coL59K3NJfLaloBfRsrRQP1 YBt50Y5XG8c4MgfZQL34smRNzGCetIdPyFIXXy/6c/l/UNb3NXXvEPhbJs+G6SsjemvJ OAHWqmpBYiVpy7N9SAY+NkkDHZ9/YF21Unp58c43/wTwNVfLF4koD6hOc6h614oOv6nM fSQrJDa1SwO19VD5TTtDhoAUlhJpgGJGiae9JGst9TlV1B5R4kWVeSa9x13W6xZlU7wK 7abUUpmAueU3Z3e8UkcZOs4jKIwxhrFBd6ZYqbMaBpU77bnJAPRQVbIPoqR5KE5Duql9 F9/w== 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=+qR9nDv0yxh0Ptui3CscTSSdWw/UhkTVcqV1oEEyQ6k=; b=lUzKrnt62PBlGkgkFI5Hln1XjkZo4aVrz9awA8OQtigMeJEkxL24QhS02Wm0XEm4Nw gGQNB009xHe0wD26NhoU7/eRCKR0oA4fNodCADYFF0bvxVVha5IndWdPI/dqOmIAFHEk AhxYXfZDcAlNgU7ptqlZC38vTJW+KW/c44kdyjRPeRl8iSvzlcshkJ07gXSAMOSauQHE 0WSOkFdGTvTbCJNSexA/gQEsny+T7R7NSuflEIl+pW/XrizwjedhY5Z924p23NvN01ms 5CzG6p6Tz3DKF0K26Xxq5JNpBrfCTBrDfM13cGS8XHUc99zocWj97RNNWppoQy9aJ8Pl BxCA== 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=giWob3Ci; 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 fy9si5981791ejc.279.2022.02.23.06.32.05; Wed, 23 Feb 2022 06:32: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=giWob3Ci; 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 5FE0368B2CD; Wed, 23 Feb 2022 16:30:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 19DC668B2B0 for ; Wed, 23 Feb 2022 16:30:08 +0200 (EET) Received: by mail-wr1-f51.google.com with SMTP id v21so4674339wrv.5 for ; Wed, 23 Feb 2022 06:30:08 -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=kWeW067ABngzkBA8nLvCRK3Y+QtZcNhr/bAB7jfDQoc=; b=giWob3CiLoYBwuwv5sI8acR6yaCNihnf1aKjhmHbagzQ2P/CfB9c0POSixNloYwJqj KVji+vJgy/NpYrhRAtWcLsucfAAuqu0/IqCn+svn7nmginqSdcHmSIGEDIO7IBYxZqS0 t0PAM9P0S9fhpgeyp8OfzhmYH2wHtgquG4BjLqQPwRAvs8Z8gAyVofaOZc1h14NprfC6 GIAKhP+DG+dyjSFRbU7ov6Mp7XNNTXkWUVNeV25XAs63jbneVFTii6w0zmrKXb8hwiv6 wUpCUZgv4251mc6zS56rDvXpBa45JXV+m57xsvlLx5eiA7lTId19MgYFTSnEbpRa0nhy 4ICg== 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=kWeW067ABngzkBA8nLvCRK3Y+QtZcNhr/bAB7jfDQoc=; b=eWLCKd5hVWyzKxgEEx/EIAenwb7CyhsS/ytOlnWnjjgwXACcjkZpfXLTqKwBZSTqit KU8tp7xZPt7end9U0YHTFSl8SY3wII85FtN8jT+RtFpgqjZSRNnnZK2TV4Em1BynMSBC Dxs34kOt3pZbmSj4wUO/Nu9zEUFaxRRmCP01G13Fr/XdOlaSTF9jSkoDVImvoHU6OzRx CeiynHJs6U6WxJ+JV9kD1MiaXHow5194pwPaXuy413PnE3YuCniO7QG/NDzbjAb05zpr kTjHfgfdYCKGxTUdT/icEysFwmlLOPS1ZwTcvxxIfXllx6LZk+jGgf7pnV1Xv4HYy8vQ nzpg== X-Gm-Message-State: AOAM5310YFYb8CpsHQb4+Dn6WYeAtofRQ0DYwztmLkr9A5P6pvRs7ofU wRmjMLA24jfRPbX4WMPgK9ImZaTcaKKwsUSs X-Received: by 2002:a5d:4b4c:0:b0:1dc:f34a:548 with SMTP id w12-20020a5d4b4c000000b001dcf34a0548mr23326814wrs.554.1645626608201; Wed, 23 Feb 2022 06:30:08 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id x2-20020a7bc762000000b00380fd1ba4ebsm1851637wmk.9.2022.02.23.06.30.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:30:07 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:49 +0200 Message-Id: <20220223142951.40366-12-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220223142951.40366-1-martin@martin.st> References: <20220223142951.40366-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/13] 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: BJ7qt4oZjMk6 --- fftools/cmdutils.c | 1 + fftools/ffprobe.c | 1 + libavfilter/Makefile | 1 + libavfilter/avfilter.c | 1 + libavfilter/avfilter.h | 2 +- libavfilter/internal.h | 1 - libavfilter/version.h | 13 ++---------- libavfilter/version_major.h | 42 +++++++++++++++++++++++++++++++++++++ 8 files changed, 49 insertions(+), 13 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 2e74580ca8..adbf538dbc 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -59,6 +59,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/internal.h b/libavfilter/internal.h index 1099b82b4b..53883101a8 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -28,7 +28,6 @@ #include "avfilter.h" #include "formats.h" #include "framequeue.h" -#include "version.h" #include "video.h" typedef struct AVFilterCommand { 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 Wed Feb 23 14:29:50 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: 34485 X-Google-Smtp-Source: ABdhPJz9sMNtRrVzc+LKDChJtdKoyfeRYQiauC8BAXRuAGFLTsIlrFo+4MfOOVf9ZxCKF5jh1rfd X-Received: by 2002:a17:906:2695:b0:6cf:e1b4:118b with SMTP id t21-20020a170906269500b006cfe1b4118bmr30795ejc.348.1645626737169; Wed, 23 Feb 2022 06:32:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626737; cv=none; d=google.com; s=arc-20160816; b=MnXNv92CR7vKRzkCIi+x1iOvr7uds49KKmB/Cqr17amrqUrpzrgdd26wttx7LZuBrd K4yvrUN7XtyvnpRmSgj/oxcEkmJDNnyZ67vKXKspKUMC+xl1cY2gNY3hgPaxl4gvoG+G GVbtUtid6sdrU6rW3KSb+rtEX6x42OiripS2YnJ0SVXTRbm/niSzO8B5rQdGllYMkC76 fQ2osg7v47FoeK7Gx/fdqSDkfdky+DEqUvF9yqcUOLe+vmPFPt/NhiyE3Dh7JXbXbUnl UUWlt4XgLp/SBwoT69EkQ1US9Tb3+92rSB4l8toJScpfoUG5l56/bP6EeCQ8hqM7DXE5 fGRA== 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=ZgfTqUw5obPUEwAOKDfhEAsJx9pW/z21QPUYqQfEEg8=; b=XSswlhlU+WuGXxhh/4bVmI50PFGMyY7xvU6TM+CFfNhHVisH9V5KgBJirIa1awSvRq boQtFXWxC+KOjGjZXVQLzKaP+odr4bY0/FdRq+8ByaZ5HqDgY2HrxCRCjIvXbFjoi10t d3tC3NrZt7g8lQuz/oWF3/QlqibGyN7TBm2/mX/cxo/vSXrpQj6+5lF2+wb0NeEExrTN w9hYg3BsX95ZW8FphZOrI2jcBI/ReySkdTvdViqntPBYSKFDcp8le3N/gvOWMZwCCDPE 5RX2PABNmQ3UzmIiunSHu1sRWzxcWo8uzCExAQUjBioZkJwSehrRsc5knwMNoaSdQwR3 /PDQ== 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=jw8Wqsl8; 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 p16si9087806eju.801.2022.02.23.06.32.16; Wed, 23 Feb 2022 06:32:17 -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=jw8Wqsl8; 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 7D21868B2DD; Wed, 23 Feb 2022 16:30:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6AE3268B2C7 for ; Wed, 23 Feb 2022 16:30:10 +0200 (EET) Received: by mail-wm1-f52.google.com with SMTP id bg16-20020a05600c3c9000b00380f6f473b0so1191095wmb.1 for ; Wed, 23 Feb 2022 06:30:10 -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=3Z8QKQI/TE8DUNW/0KxKG5gXzuoESHZXZ+PqTJe+sLw=; b=jw8Wqsl8xXGXjWkIdrhOMB0mgiBn+EESGKuxmySoBmqc44aLplskZOvMxlUsi/XkyA 6wuFAUszbGU7Kz834d44HJL2U3X0nuP7UhTVRFfbXocjeGZeDAuEIm43Ovilef7ZykTl 5w7L1hSXC5FduxHZYkkqx9/zHp96UD+CIIB/yp7XI7xww4Zgp18LzF6I+TfLFH8Ezboj L47/fi5i9jz8dAQDczF+FsggVroQOOiv1h3it7MSE7Hq0oIq7vIewNQmnTUXOijfwwR9 ri9ViT+y4DJgGHPNCtGMR3HaOd9KlKKFA8K7etV/crNu8tYuJjrclgoBZv9gaSXOoHtH oS7A== 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=3Z8QKQI/TE8DUNW/0KxKG5gXzuoESHZXZ+PqTJe+sLw=; b=UukbpHWXU4S5GMulQNZSH9q3F4sprUxA3hw22yNXoslUVYolFf8is9IOYZ04x1IDcp 6UooJw/z7oMpgcsb75cBTna9prkvA3BKqVvFz2tTq8pK1TkxTq7GG17n3cNyT4NLM2Tf V+9ilcbhTvgOYPt3CvWXf8McGeq8p1+laJmnH5QOWPDH24zoT1jDKDiH1dFbPhWC0gZp KKItAlVhAhFIUsDbCVyPIyDsxv1e1vycua9UiVNxJ3W66s/zZ51sEWg8c2dUmrPKF2Xa EpEqNGu/O5C4oFz8z4Hb/FetuGcuKwGBqyhbyH4ox8Jb/vGBM2WJ02vDeeVgKlpCOUAI tm2A== X-Gm-Message-State: AOAM532X2LGRZLxev29PFrbfr6ICqUXCnItNgnCBEGWgK5f6psiyUvvu Huh9jJi0IGmYIvm9MaYMrUs0bNhPAH0d7ONf X-Received: by 2002:a7b:c381:0:b0:37b:e01f:c1c0 with SMTP id s1-20020a7bc381000000b0037be01fc1c0mr7719431wmj.98.1645626609633; Wed, 23 Feb 2022 06:30:09 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id f6sm37584736wrv.116.2022.02.23.06.30.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:30:09 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:50 +0200 Message-Id: <20220223142951.40366-13-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220223142951.40366-1-martin@martin.st> References: <20220223142951.40366-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/13] 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: AkV7NIe/YQ/u --- doc/APIchanges | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index ea402f6118..adbfc79e13 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-02-07 - xxxxxxxxxx - lavu 57.21.100 - fifo.h Deprecate AVFifoBuffer and the API around it, namely av_fifo_alloc(), av_fifo_alloc_array(), av_fifo_free(), av_fifo_freep(), av_fifo_reset(), From patchwork Wed Feb 23 14:29:51 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: 34486 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp892155nkx; Wed, 23 Feb 2022 06:32:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1GCnAB2Vg3huoRpmjVHtIqbvDziQZhQfXck9T7Mvxerv4BkxFV0uYE6D8OngMSUv1LPjc X-Received: by 2002:a50:fc81:0:b0:408:4c2d:bf69 with SMTP id f1-20020a50fc81000000b004084c2dbf69mr31630869edq.229.1645626749988; Wed, 23 Feb 2022 06:32:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626749; cv=none; d=google.com; s=arc-20160816; b=yVmco8yWKwM9ZqurKucLaCQWKPhNrYO+d1FVhTM4tp5DvWx/RNmdRPzI6rByLiVLue di9okVXfBZ+aCFnrh/W2UiSYxna5jvOGkbONSdTla5ViKsy5atiGpvkEtcE1p2zpZB6f aYSOnsU7BNuS6dRjIElLIqR962Z1SEWtm3nTv9/DKxqxdXHFM7pF331CPet+vGhKYoiK 0UwrdZbklZmaDUfC1L2tYy6+dECL+F7RkuAiBy8iIxZdXVIScqDxNtX4a/q0RQ+etJCn MzuutBCwekXjKsrJAsivioqJYGDO0GJf+ufs4KD+gPDziPRtaCDb4EXJWZAShsgCPWXN zKYg== 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=FDwZlrAnSLNiP0aHPx0EoOsYBOFu2iFvM0fBzKbiKuA=; b=jF2c1/F0AhD51OiuVbHA3U1X2ke4vskR8u+1glVmDehB7ImQseUMZkCEqVujTvug37 3JdTb7PW2hWxco/pnouJ5uvOkyGrvWgH2jnVqqkUCLwAYZjMSGrx68st6UhXM8hg4nw+ psvQZd+ncSLm2RtLrMcm4qNoucTqZVlGXUcBmFbdTgjt+5s7YINVc4tpbLTY2yhj0Lbj iOTGs0U5QSIUZGjE6eJEmNXdxcW8ah9QD03nNQ/ps6FvcYLRRiJ24yq4/IckaNrgnNkf d5LTDjfv9hMlrNHctGLpgCUf5yuXiyneGLRf+wszs5Q4vikowWKgp8TNirTpIR6OTDJe vdMA== 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=jZB7qpTY; 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 t17si18551161edd.586.2022.02.23.06.32.29; Wed, 23 Feb 2022 06:32:29 -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=jZB7qpTY; 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 91A5868B2C9; Wed, 23 Feb 2022 16:30:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E6C868B2A7 for ; Wed, 23 Feb 2022 16:30:12 +0200 (EET) Received: by mail-wr1-f46.google.com with SMTP id p9so39928798wra.12 for ; Wed, 23 Feb 2022 06:30:12 -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=4FnXZ1htl17HSgPSN27dAPKZMlWXL3G4pYJl6V0yFZg=; b=jZB7qpTY1zz69AZxMU1i4Xa+Ln9XIsZbK/MgIz/Z/jz9lWYwdgafF/E5MofBsw2zLv mx+k9t2xY6+LtSTp+yjL9SRuCj52jN1z/jkDmIR2U2N6rLvU0uW14n04oJzLhgq1sa1T r7LOZLOE2/jQLDjJEeEg43vUYOTfDjDBuVjFs5ZaqDD5pJfrYUGdaC2YDFsxgHikss7v pJiL8XSLXnB0yU+KJkPlDtgY0V8nIkkhgdL7cIYSNLoY6BZokkSc1kBZIgK+RYtgt3nh 4Sgzv2g8AzDLvQRIY+k+T3f0tlP+GoEJMcOfRS2AmhNgXsO3Tr+6YGM23eKDwOUy7XR7 BUpQ== 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=4FnXZ1htl17HSgPSN27dAPKZMlWXL3G4pYJl6V0yFZg=; b=4VQtxvJbaSJnSPndJek5KKG1um3Km1KpUYbH/DODp1SI5TtzXqrdmCMG2J6g2S/WKN 8WVQYyQMqpQhlvByE1FT1923oU8fBXAd94ow/3x+h4/onGgCGV5iOi0RMXFUF41yOhjc ff3qceBDExQ/WrG7QZJvq/grE1+4DoZmQzh7Z7EWZyZPUre54lOZzo5I2S/v80FWON2W ifOqc5QUy7jbWZea6ungrUFfHSGf1X/0jZYGKBS/8Bl7StUQ6wZDNcBPFP7cQGqIU4iV i4RiGZ3pMC9GFawIs+5LwysxYnJHSK85uJyssqeP/tRlrZhMkjZ7TtjZYNs/E9BCUGwC wMOw== X-Gm-Message-State: AOAM530uArMDRGtr9JfuW4gFbJ1t4Wc7YsvH1SA7TyIpffKTejAIroIi bOXkPbhAFOgMe71k1i9PA05DqlV+O+vCGx7c X-Received: by 2002:a5d:630c:0:b0:1e3:3e4c:c5cc with SMTP id i12-20020a5d630c000000b001e33e4cc5ccmr22953854wru.612.1645626611161; Wed, 23 Feb 2022 06:30:11 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id g16-20020a7bc4d0000000b0037bbe255339sm5721742wmk.15.2022.02.23.06.30.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:30:10 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:51 +0200 Message-Id: <20220223142951.40366-14-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220223142951.40366-1-martin@martin.st> References: <20220223142951.40366-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/13] 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: 4q+z+ea61p2Q 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 | 1 + libavcodec/a64multienc.c | 1 + libavcodec/aac_ac3_parser.c | 1 + libavcodec/aactab.c | 1 + libavcodec/aarch64/h264cmc_neon.S | 1 + libavcodec/ac3_parser.c | 1 + libavcodec/ac3dec.c | 1 + libavcodec/ac3enc.c | 1 + libavcodec/ac3enc_template.c | 1 + libavcodec/adpcm.c | 1 + libavcodec/adpcmenc.c | 1 + libavcodec/allcodecs.c | 1 + libavcodec/aptxdec.c | 1 + libavcodec/aptxenc.c | 1 + libavcodec/arm/flacdsp_init_arm.c | 1 + libavcodec/arm/h264cmc_neon.S | 1 + libavcodec/assdec.c | 1 + libavcodec/assenc.c | 1 + libavcodec/asvdec.c | 1 + libavcodec/asvenc.c | 1 + libavcodec/audiotoolboxdec.c | 1 + libavcodec/av1dec.c | 1 + libavcodec/binkaudio.c | 1 + libavcodec/bintext.c | 1 + libavcodec/bsf.c | 1 + libavcodec/cyuv.c | 1 + libavcodec/flashsv.c | 1 + libavcodec/g726.c | 1 + libavcodec/gsmdec.c | 1 + libavcodec/h263dec.c | 1 + libavcodec/h264_slice.c | 1 + libavcodec/h264dec.c | 2 ++ libavcodec/hevcdec.c | 1 + libavcodec/huffyuvdec.c | 1 + libavcodec/huffyuvenc.c | 1 + libavcodec/idctdsp.c | 1 + libavcodec/iff.c | 1 + libavcodec/imc.c | 1 + libavcodec/ituh263dec.c | 1 + libavcodec/ituh263enc.c | 1 + libavcodec/lcldec.c | 1 + libavcodec/libgsmdec.c | 1 + libavcodec/libgsmenc.c | 1 + libavcodec/libopencore-amr.c | 1 + libavcodec/libvpx.c | 1 + libavcodec/libvpxdec.c | 1 + libavcodec/libvpxenc.c | 1 + libavcodec/libx264.c | 1 + libavcodec/me_cmp.c | 1 + libavcodec/metasound_data.c | 1 + libavcodec/mjpegdec.c | 1 + libavcodec/mjpegenc.c | 1 + libavcodec/mlpdec.c | 1 + libavcodec/mlpenc.c | 1 + libavcodec/mpeg12dec.c | 1 + libavcodec/mpeg12enc.c | 1 + libavcodec/mpeg4videodec.c | 1 + libavcodec/mpegaudiodec_fixed.c | 1 + libavcodec/mpegaudiodec_float.c | 1 + libavcodec/mpegvideo.c | 1 + libavcodec/mpegvideo_enc.c | 1 + libavcodec/mpegvideo_motion.c | 1 + libavcodec/msmpeg4.c | 1 + libavcodec/msmpeg4dec.c | 1 + libavcodec/mvcdec.c | 1 + libavcodec/options.c | 1 + libavcodec/opus_pvq.c | 1 + libavcodec/pcm.c | 1 + libavcodec/pngdec.c | 1 + libavcodec/pnmdec.c | 1 + libavcodec/pnmenc.c | 1 + libavcodec/proresdec2.c | 1 + libavcodec/qpeldsp.c | 1 + libavcodec/r210dec.c | 1 + libavcodec/r210enc.c | 1 + libavcodec/rv34_parser.c | 1 + libavcodec/sonic.c | 1 + libavcodec/sp5xdec.c | 1 + libavcodec/speedhq.c | 1 + libavcodec/speedhqenc.c | 1 + libavcodec/srtdec.c | 1 + libavcodec/srtenc.c | 1 + libavcodec/textdec.c | 1 + libavcodec/v408dec.c | 1 + libavcodec/v408enc.c | 1 + libavcodec/vc1dec.c | 1 + libavcodec/vc1dsp.c | 1 + libavcodec/videotoolbox.c | 1 + libavcodec/vorbis_parser.c | 1 + libavcodec/vp3.c | 1 + libavcodec/vp56dsp.c | 1 + libavcodec/vp8.c | 1 + libavcodec/vp8dsp.c | 1 + libavcodec/vp9.c | 1 + libavcodec/wmadec.c | 1 + libavcodec/wmaenc.c | 1 + libavcodec/x86/flacdsp_init.c | 1 + libavcodec/x86/hpeldsp_init.c | 1 + libavfilter/aeval.c | 1 + libavfilter/af_afade.c | 1 + libavfilter/af_agate.c | 1 + libavfilter/af_biquads.c | 1 + libavfilter/af_sidechaincompress.c | 1 + libavfilter/avf_showspectrum.c | 1 + libavfilter/avf_showwaves.c | 1 + libavfilter/f_bench.c | 1 + libavfilter/f_cue.c | 1 + libavfilter/f_drawgraph.c | 1 + libavfilter/f_graphmonitor.c | 1 + libavfilter/f_interleave.c | 1 + libavfilter/f_latency.c | 1 + libavfilter/f_loop.c | 1 + libavfilter/f_metadata.c | 1 + libavfilter/f_perms.c | 1 + libavfilter/f_realtime.c | 1 + libavfilter/f_reverse.c | 1 + libavfilter/f_segment.c | 1 + libavfilter/f_select.c | 1 + libavfilter/f_sendcmd.c | 1 + libavfilter/f_sidedata.c | 1 + libavfilter/lut3d.h | 1 + libavfilter/setpts.c | 1 + libavfilter/settb.c | 1 + libavfilter/src_movie.c | 1 + libavfilter/trim.c | 1 + libavfilter/vf_aspect.c | 1 + libavfilter/vf_blend.c | 1 + libavfilter/vf_colorconstancy.c | 1 + libavfilter/vf_colorkey.c | 1 + libavfilter/vf_convolution.c | 1 + libavfilter/vf_convolve.c | 1 + libavfilter/vf_drawbox.c | 1 + libavfilter/vf_extractplanes.c | 1 + libavfilter/vf_format.c | 1 + libavfilter/vf_histogram.c | 1 + libavfilter/vf_identity.c | 1 + libavfilter/vf_lut.c | 1 + libavfilter/vf_lut2.c | 1 + libavfilter/vf_mix.c | 1 + libavfilter/vf_neighbor.c | 1 + libavfilter/vf_premultiply.c | 1 + libavfilter/vf_setparams.c | 1 + libavfilter/vf_stack.c | 1 + libavfilter/vf_xmedian.c | 1 + libavfilter/vsrc_testsrc.c | 1 + libavformat/ac3dec.c | 1 + libavformat/alp.c | 1 + libavformat/amr.c | 1 + libavformat/apm.c | 1 + libavformat/aptxdec.c | 1 + libavformat/argo_asf.c | 1 + libavformat/argo_cvg.c | 1 + libavformat/asfenc.c | 1 + libavformat/au.c | 1 + libavformat/av1dec.c | 1 + libavformat/avidec.c | 1 + libavformat/avienc.c | 1 + libavformat/bintext.c | 1 + libavformat/bit.c | 1 + libavformat/codec2.c | 1 + libavformat/concat.c | 1 + libavformat/dashenc.c | 1 + libavformat/demux.c | 1 + libavformat/file.c | 1 + libavformat/format.c | 1 + libavformat/g726.c | 1 + libavformat/gopher.c | 1 + libavformat/hashenc.c | 1 + libavformat/hls.c | 1 + libavformat/hlsenc.c | 1 + libavformat/http.c | 1 + libavformat/ilbc.c | 1 + libavformat/img2dec.c | 1 + libavformat/img2enc.c | 1 + libavformat/kvag.c | 1 + libavformat/matroskadec.c | 1 + libavformat/matroskaenc.c | 1 + libavformat/mj2kdec.c | 1 + libavformat/mlpdec.c | 1 + libavformat/mmf.c | 1 + libavformat/mov.c | 1 + libavformat/movenc.c | 1 + libavformat/mpeg.c | 1 + libavformat/mpegenc.c | 1 + libavformat/mpegts.c | 1 + libavformat/network.c | 1 + libavformat/oggenc.c | 1 + libavformat/pcmdec.c | 1 + libavformat/pcmenc.c | 1 + libavformat/rawdec.c | 1 + libavformat/rawenc.c | 1 + libavformat/rawvideodec.c | 1 + libavformat/riff.c | 1 + libavformat/rtmpproto.c | 1 + libavformat/rtsp.c | 1 + libavformat/rtspdec.c | 1 + libavformat/sdp.c | 1 + libavformat/segment.c | 1 + libavformat/swfenc.c | 1 + libavformat/voc.c | 1 + libavformat/wavdec.c | 1 + libavformat/wavenc.c | 1 + 204 files changed, 219 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1535dc3c5b..cc5b9e0013 100755 --- a/configure +++ b/configure @@ -7788,17 +7788,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..bedcb50461 100644 --- a/libavcodec/8svx.c +++ b/libavcodec/8svx.c @@ -39,6 +39,7 @@ #include "libavutil/avassert.h" #include "avcodec.h" +#include "config_components.h" #include "internal.h" #include "libavutil/common.h" diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c index 7bdf4a61b1..d5b31afb39 100644 --- a/libavcodec/a64multienc.c +++ b/libavcodec/a64multienc.c @@ -26,6 +26,7 @@ #include "a64colors.h" #include "a64tables.h" +#include "config_components.h" #include "elbg.h" #include "encode.h" #include "internal.h" diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index e84d30aea2..c78f63671a 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -24,6 +24,7 @@ #include "libavutil/common.h" #include "parser.h" #include "aac_ac3_parser.h" +#include "config_components.h" int ff_aac_ac3_parse(AVCodecParserContext *s1, AVCodecContext *avctx, 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..258aeb7e85 100644 --- a/libavcodec/aarch64/h264cmc_neon.S +++ b/libavcodec/aarch64/h264cmc_neon.S @@ -20,6 +20,7 @@ */ #include "libavutil/aarch64/asm.S" +#include "config_components.h" /* chroma_mc8(uint8_t *dst, uint8_t *src, ptrdiff_t stride, int h, int x, int y) */ .macro h264_chroma_mc8 type, codec=h264 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..ddf8513246 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -40,6 +40,7 @@ #include "ac3_parser_internal.h" #include "ac3dec.h" #include "ac3dec_data.h" +#include "config_components.h" #include "kbdwin.h" /** 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..1ff3789f09 100644 --- a/libavcodec/ac3enc_template.c +++ b/libavcodec/ac3enc_template.c @@ -33,6 +33,7 @@ #include "libavutil/mem_internal.h" #include "audiodsp.h" +#include "config_components.h" #include "internal.h" #include "ac3enc.h" #include "eac3enc.h" diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index cfde5f58b9..9c4d7bd3b1 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -35,6 +35,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avcodec.h" +#include "config_components.h" #include "get_bits.h" #include "bytestream.h" #include "adpcm.h" diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index b0f6f209b7..c2688a2685 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "avcodec.h" +#include "config_components.h" #include "put_bits.h" #include "bytestream.h" #include "adpcm.h" diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index d1e10197de..58b8befa2b 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..173dbaa2de 100644 --- a/libavcodec/aptxdec.c +++ b/libavcodec/aptxdec.c @@ -22,6 +22,7 @@ #include "libavutil/channel_layout.h" #include "aptx.h" +#include "config_components.h" /* * Half-band QMF synthesis filter realized with a polyphase FIR filter. diff --git a/libavcodec/aptxenc.c b/libavcodec/aptxenc.c index 5ea6053c26..fca30745ab 100644 --- a/libavcodec/aptxenc.c +++ b/libavcodec/aptxenc.c @@ -22,6 +22,7 @@ #include "libavutil/channel_layout.h" #include "aptx.h" +#include "config_components.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..847c7c6afa 100644 --- a/libavcodec/arm/h264cmc_neon.S +++ b/libavcodec/arm/h264cmc_neon.S @@ -19,6 +19,7 @@ */ #include "libavutil/arm/asm.S" +#include "config_components.h" /* chroma_mc8(uint8_t *dst, uint8_t *src, ptrdiff_t stride, int h, int x, int y) */ .macro h264_chroma_mc8 type, codec=h264 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..61c416d616 100644 --- a/libavcodec/assenc.c +++ b/libavcodec/assenc.c @@ -23,6 +23,7 @@ #include "avcodec.h" #include "ass.h" +#include "config_components.h" #include "internal.h" #include "libavutil/avstring.h" #include "libavutil/internal.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..d8eec960c4 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -29,6 +29,7 @@ #include "aandcttab.h" #include "asv.h" #include "avcodec.h" +#include "config_components.h" #include "dct.h" #include "encode.h" #include "fdctdsp.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..1c65e3df9f 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -24,6 +24,7 @@ #include "avcodec.h" #include "av1dec.h" #include "bytestream.h" +#include "config_components.h" #include "hwconfig.h" #include "internal.h" #include "profiles.h" diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index f808141ba5..fec1e530cb 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -34,6 +34,7 @@ #define BITSTREAM_READER_LE #include "avcodec.h" +#include "config_components.h" #include "dct.h" #include "decode.h" #include "get_bits.h" diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c index 553f020738..8eaddc0834 100644 --- a/libavcodec/bintext.c +++ b/libavcodec/bintext.c @@ -32,6 +32,7 @@ #include "libavutil/xga_font_data.h" #include "avcodec.h" #include "cga_data.h" +#include "config_components.h" #include "bintext.h" #include "internal.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..1c52c36373 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -33,6 +33,7 @@ #include #include "avcodec.h" +#include "config_components.h" #include "internal.h" #include "libavutil/internal.h" diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 00f77f4902..dfe2b7b926 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -40,6 +40,7 @@ #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "bytestream.h" +#include "config_components.h" #include "get_bits.h" #include "internal.h" diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 2a0148c1d5..0cb1ca6f73 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -26,6 +26,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avcodec.h" +#include "config_components.h" #include "encode.h" #include "internal.h" #include "get_bits.h" diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index c169112311..6d19784d4e 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -26,6 +26,7 @@ #include "libavutil/channel_layout.h" #include "avcodec.h" +#include "config_components.h" #include "get_bits.h" #include "internal.h" #include "msgsmdec.h" diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index e940b7f7c7..2d67cffcc3 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -28,6 +28,7 @@ #define UNCHECKED_BITSTREAM_READER 1 #include "avcodec.h" +#include "config_components.h" #include "error_resilience.h" #include "flvdec.h" #include "h263.h" diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 110a41772a..bbb57d969e 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -34,6 +34,7 @@ #include "internal.h" #include "cabac.h" #include "cabac_functions.h" +#include "config_components.h" #include "error_resilience.h" #include "avcodec.h" #include "h264.h" diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 856fbca680..fd7f83d874 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -33,6 +33,8 @@ #include "libavutil/thread.h" #include "libavutil/video_enc_params.h" +#include "config_components.h" + #include "internal.h" #include "error_resilience.h" #include "avcodec.h" diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 1d4ad42278..79c4fbb0e5 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -38,6 +38,7 @@ #include "bswapdsp.h" #include "bytestream.h" #include "cabac_functions.h" +#include "config_components.h" #include "golomb.h" #include "hevc.h" #include "hevc_data.h" diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index a5e0ef5818..b879214aac 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -33,6 +33,7 @@ #define UNCHECKED_BITSTREAM_READER 1 #include "avcodec.h" +#include "config_components.h" #include "get_bits.h" #include "huffyuv.h" #include "huffyuvdsp.h" diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 97497a8e75..222e8b35ec 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -29,6 +29,7 @@ */ #include "avcodec.h" +#include "config_components.h" #include "encode.h" #include "huffyuv.h" #include "huffman.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..6eb2bb0141 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -32,6 +32,7 @@ #include "bytestream.h" #include "avcodec.h" +#include "config_components.h" #include "internal.h" #include "mathops.h" diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 116c273ba0..859ae652f3 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -42,6 +42,7 @@ #include "libavutil/thread.h" #include "avcodec.h" +#include "config_components.h" #include "bswapdsp.h" #include "get_bits.h" #include "fft.h" diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 0c9473af56..c8cd03f936 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -36,6 +36,7 @@ #include "libavutil/mem_internal.h" #include "libavutil/thread.h" #include "avcodec.h" +#include "config_components.h" #include "mpegvideo.h" #include "h263.h" #include "h263data.h" diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 8bedecb36e..ced4b8c307 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -32,6 +32,7 @@ #include "libavutil/attributes.h" #include "libavutil/thread.h" #include "avcodec.h" +#include "config_components.h" #include "mpegvideo.h" #include "mpegvideodata.h" #include "flvenc.h" diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index f3b7a8ac1b..f9b54b3c99 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -43,6 +43,7 @@ #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "avcodec.h" +#include "config_components.h" #include "bytestream.h" #include "internal.h" #include "lcl.h" 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..4bcfbd62dc 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -27,6 +27,7 @@ #include "libavutil/opt.h" #include "avcodec.h" #include "audio_frame_queue.h" +#include "config_components.h" #include "encode.h" #include "internal.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..2e3b9d3ad8 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -33,6 +33,7 @@ #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" +#include "config_components.h" #include "decode.h" #include "internal.h" #include "libvpx.h" diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 8f94ba15dc..8c0a7f3fae 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -29,6 +29,7 @@ #include #include "avcodec.h" +#include "config_components.h" #include "encode.h" #include "internal.h" #include "libavutil/avassert.h" diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index c5e0231b12..81ab1b0813 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -28,6 +28,7 @@ #include "libavutil/time.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" +#include "config_components.h" #include "encode.h" #include "internal.h" #include "packet_internal.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..a9fc2281fe 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -35,6 +35,7 @@ #include "libavutil/avassert.h" #include "libavutil/opt.h" #include "avcodec.h" +#include "config_components.h" #include "blockdsp.h" #include "copy_block.h" #include "decode.h" diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 08671b0df7..9bd33f439f 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -33,6 +33,7 @@ #include "libavutil/pixdesc.h" #include "avcodec.h" +#include "config_components.h" #include "jpegtables.h" #include "mjpegenc_common.h" #include "mjpegenc_huffman.h" diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 29fac54542..9d5c2e1b21 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -27,6 +27,7 @@ #include #include "avcodec.h" +#include "config_components.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/channel_layout.h" diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index d8783b6f56..8cf42b8e72 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -21,6 +21,7 @@ */ #include "avcodec.h" +#include "config_components.h" #include "encode.h" #include "internal.h" #include "put_bits.h" diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 9e4e26aa67..49cb4727a3 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -36,6 +36,7 @@ #include "libavutil/timecode.h" #include "avcodec.h" +#include "config_components.h" #include "error_resilience.h" #include "hwconfig.h" #include "idctdsp.h" 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..0a839846d3 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -25,6 +25,7 @@ #include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/thread.h" +#include "config_components.h" #include "error_resilience.h" #include "hwconfig.h" #include "idctdsp.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..587a383963 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -34,6 +34,7 @@ #include "avcodec.h" #include "blockdsp.h" +#include "config_components.h" #include "h264chroma.h" #include "idctdsp.h" #include "mathops.h" diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index c69114ea15..b09ee2a192 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -41,6 +41,7 @@ #include "libavutil/opt.h" #include "libavutil/thread.h" #include "avcodec.h" +#include "config_components.h" #include "dct.h" #include "encode.h" #include "idctdsp.h" diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c index 876a7375f8..76f66db3a6 100644 --- a/libavcodec/mpegvideo_motion.c +++ b/libavcodec/mpegvideo_motion.c @@ -26,6 +26,7 @@ #include "libavutil/mem_internal.h" #include "avcodec.h" +#include "config_components.h" #include "h261.h" #include "mpegutils.h" #include "mpegvideo.h" diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index f12586dd64..bf061ed8d3 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -30,6 +30,7 @@ #include "libavutil/thread.h" #include "avcodec.h" +#include "config_components.h" #include "idctdsp.h" #include "mpegvideo.h" #include "msmpeg4.h" diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index 29edd94427..f149e8b7e2 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -25,6 +25,7 @@ #include "libavutil/thread.h" #include "avcodec.h" +#include "config_components.h" #include "internal.h" #include "mpegutils.h" #include "mpegvideo.h" diff --git a/libavcodec/mvcdec.c b/libavcodec/mvcdec.c index ae5ce4c0d7..a0a8ef937c 100644 --- a/libavcodec/mvcdec.c +++ b/libavcodec/mvcdec.c @@ -28,6 +28,7 @@ #include "avcodec.h" #include "bytestream.h" +#include "config_components.h" #include "internal.h" typedef struct MvcContext { diff --git a/libavcodec/options.c b/libavcodec/options.c index bba6078b62..55ae5b9c2d 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -25,6 +25,7 @@ */ #include "avcodec.h" +#include "config_components.h" #include "internal.h" #include "libavutil/avassert.h" #include "libavutil/internal.h" diff --git a/libavcodec/opus_pvq.c b/libavcodec/opus_pvq.c index a4ab7c46eb..e5ed24f411 100644 --- a/libavcodec/opus_pvq.c +++ b/libavcodec/opus_pvq.c @@ -23,6 +23,7 @@ * 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 39bb652f67..2f4605c57d 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -30,6 +30,7 @@ #include "libavutil/mastering_display_metadata.h" #include "avcodec.h" +#include "config_components.h" #include "bytestream.h" #include "internal.h" #include "apng.h" diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index 01f9dade1a..bf5ad68deb 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -20,6 +20,7 @@ */ #include "avcodec.h" +#include "config_components.h" #include "internal.h" #include "put_bits.h" #include "pnm.h" diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 8378f90d08..6bc5663c5b 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -23,6 +23,7 @@ #include "libavutil/imgutils.h" #include "libavutil/pixdesc.h" #include "avcodec.h" +#include "config_components.h" #include "encode.h" #include "internal.h" diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 3ab6666f74..d88254c78c 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -32,6 +32,7 @@ #include "libavutil/mem_internal.h" #include "avcodec.h" +#include "config_components.h" #include "get_bits.h" #include "hwconfig.h" #include "idctdsp.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..1d281f2322 100644 --- a/libavcodec/r210enc.c +++ b/libavcodec/r210enc.c @@ -21,6 +21,7 @@ */ #include "avcodec.h" +#include "config_components.h" #include "encode.h" #include "internal.h" #include "bytestream.h" diff --git a/libavcodec/rv34_parser.c b/libavcodec/rv34_parser.c index 03469ed0d1..4ce95d5329 100644 --- a/libavcodec/rv34_parser.c +++ b/libavcodec/rv34_parser.c @@ -24,6 +24,7 @@ * 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..fde8f44d55 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avcodec.h" +#include "config_components.h" #include "encode.h" #include "get_bits.h" #include "golomb.h" diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c index a1b43f8f80..6415778af1 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -25,6 +25,7 @@ */ #include "avcodec.h" +#include "config_components.h" #include "internal.h" #include "mjpeg.h" #include "mjpegdec.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..38df8ae5d5 100644 --- a/libavcodec/speedhqenc.c +++ b/libavcodec/speedhqenc.c @@ -30,6 +30,7 @@ #include "libavutil/thread.h" #include "avcodec.h" +#include "config_components.h" #include "mpeg12data.h" #include "mpeg12enc.h" #include "mpegvideo.h" diff --git a/libavcodec/srtdec.c b/libavcodec/srtdec.c index 4f16226b83..fdc02b57bd 100644 --- a/libavcodec/srtdec.c +++ b/libavcodec/srtdec.c @@ -25,6 +25,7 @@ #include "libavutil/parseutils.h" #include "avcodec.h" #include "ass.h" +#include "config_components.h" #include "htmlsubtitles.h" #include "internal.h" diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c index 2e3ac55770..98982f00d6 100644 --- a/libavcodec/srtenc.c +++ b/libavcodec/srtenc.c @@ -21,6 +21,7 @@ #include #include "avcodec.h" +#include "config_components.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" #include "ass_split.h" diff --git a/libavcodec/textdec.c b/libavcodec/textdec.c index 308553660a..b569f1ac63 100644 --- a/libavcodec/textdec.c +++ b/libavcodec/textdec.c @@ -25,6 +25,7 @@ #include "avcodec.h" #include "ass.h" +#include "config_components.h" #include "internal.h" #include "libavutil/bprint.h" #include "libavutil/opt.h" diff --git a/libavcodec/v408dec.c b/libavcodec/v408dec.c index 749b3b65e5..acf86ba00b 100644 --- a/libavcodec/v408dec.c +++ b/libavcodec/v408dec.c @@ -20,6 +20,7 @@ */ #include "avcodec.h" +#include "config_components.h" #include "internal.h" static av_cold int v408_decode_init(AVCodecContext *avctx) diff --git a/libavcodec/v408enc.c b/libavcodec/v408enc.c index 31bf48406c..2392449b4f 100644 --- a/libavcodec/v408enc.c +++ b/libavcodec/v408enc.c @@ -22,6 +22,7 @@ #include "libavutil/intreadwrite.h" #include "avcodec.h" +#include "config_components.h" #include "encode.h" #include "internal.h" diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index d9939a8ba1..33ae1ca492 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -28,6 +28,7 @@ #include "avcodec.h" #include "blockdsp.h" +#include "config_components.h" #include "get_bits.h" #include "hwconfig.h" #include "internal.h" diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c index 04fc8b12f3..c529e21963 100644 --- a/libavcodec/vc1dsp.c +++ b/libavcodec/vc1dsp.c @@ -27,6 +27,7 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/intreadwrite.h" +#include "config_components.h" #include "h264chroma.h" #include "qpeldsp.h" #include "rnd_avg.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..3c8c4b2385 100644 --- a/libavcodec/vorbis_parser.c +++ b/libavcodec/vorbis_parser.c @@ -27,6 +27,7 @@ #include "libavutil/log.h" +#include "config_components.h" #include "get_bits.h" #include "parser.h" #include "xiph.h" diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index e2418eb6fa..415c7f5590 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -38,6 +38,7 @@ #include "libavutil/mem_internal.h" #include "avcodec.h" +#include "config_components.h" #include "get_bits.h" #include "hpeldsp.h" #include "internal.h" 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..02dcefdd83 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -28,6 +28,7 @@ #include "libavutil/mem_internal.h" #include "avcodec.h" +#include "config_components.h" #include "hwconfig.h" #include "internal.h" #include "mathops.h" diff --git a/libavcodec/vp8dsp.c b/libavcodec/vp8dsp.c index 732a483b62..b19330d6ae 100644 --- a/libavcodec/vp8dsp.c +++ b/libavcodec/vp8dsp.c @@ -28,6 +28,7 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" +#include "config_components.h" #include "mathops.h" #include "vp8dsp.h" diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 7ef10f7a80..5e99cccbf1 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -22,6 +22,7 @@ */ #include "avcodec.h" +#include "config_components.h" #include "get_bits.h" #include "hwconfig.h" #include "internal.h" diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 9955aaa7d6..c886c71c37 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -37,6 +37,7 @@ #include "libavutil/ffmath.h" #include "avcodec.h" +#include "config_components.h" #include "internal.h" #include "wma.h" diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 66e3537cb0..02c92a2dc7 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -23,6 +23,7 @@ #include "libavutil/ffmath.h" #include "avcodec.h" +#include "config_components.h" #include "encode.h" #include "internal.h" #include "wma.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..3e8b4a44c9 100644 --- a/libavcodec/x86/hpeldsp_init.c +++ b/libavcodec/x86/hpeldsp_init.c @@ -30,6 +30,7 @@ #include "libavcodec/pixels.h" #include "fpel.h" #include "hpeldsp.h" +#include "config_components.h" void ff_put_pixels8_x2_mmxext(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); diff --git a/libavfilter/aeval.c b/libavfilter/aeval.c index 42cfa81325..f89faf7258 100644 --- a/libavfilter/aeval.c +++ b/libavfilter/aeval.c @@ -30,6 +30,7 @@ #include "libavutil/parseutils.h" #include "avfilter.h" #include "audio.h" +#include "config_components.h" #include "filters.h" #include "internal.h" diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c index c57709050e..eef585c14a 100644 --- a/libavfilter/af_afade.c +++ b/libavfilter/af_afade.c @@ -26,6 +26,7 @@ #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" +#include "config_components.h" #include "filters.h" #include "internal.h" diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c index 682f17c7dd..0efad1f43e 100644 --- a/libavfilter/af_agate.c +++ b/libavfilter/af_agate.c @@ -28,6 +28,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "config_components.h" #include "filters.h" #include "formats.h" #include "hermite.h" diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c index ee42b2a034..2e5e432519 100644 --- a/libavfilter/af_biquads.c +++ b/libavfilter/af_biquads.c @@ -68,6 +68,7 @@ #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" +#include "config_components.h" #include "internal.h" enum FilterType { diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index c0ce82066b..e1b58898ed 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -31,6 +31,7 @@ #include "audio.h" #include "avfilter.h" +#include "config_components.h" #include "filters.h" #include "formats.h" #include "hermite.h" diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index 610dc98c93..ea8ec2a4a9 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -38,6 +38,7 @@ #include "libavutil/parseutils.h" #include "libavutil/xga_font_data.h" #include "audio.h" +#include "config_components.h" #include "video.h" #include "avfilter.h" #include "filters.h" diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c index 853f6bbdcb..c27e612a7a 100644 --- a/libavfilter/avf_showwaves.c +++ b/libavfilter/avf_showwaves.c @@ -29,6 +29,7 @@ #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "avfilter.h" +#include "config_components.h" #include "filters.h" #include "formats.h" #include "audio.h" diff --git a/libavfilter/f_bench.c b/libavfilter/f_bench.c index 109a530d7c..f1d2a4c69d 100644 --- a/libavfilter/f_bench.c +++ b/libavfilter/f_bench.c @@ -19,6 +19,7 @@ #include "libavutil/opt.h" #include "libavutil/time.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/f_cue.c b/libavfilter/f_cue.c index d90fe54b9a..99184824ae 100644 --- a/libavfilter/f_cue.c +++ b/libavfilter/f_cue.c @@ -21,6 +21,7 @@ #include "libavutil/opt.h" #include "libavutil/time.h" #include "avfilter.h" +#include "config_components.h" #include "filters.h" #include "internal.h" diff --git a/libavfilter/f_drawgraph.c b/libavfilter/f_drawgraph.c index b6fcb3b75e..da608a44f3 100644 --- a/libavfilter/f_drawgraph.c +++ b/libavfilter/f_drawgraph.c @@ -25,6 +25,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/f_graphmonitor.c b/libavfilter/f_graphmonitor.c index 51d0a568e3..a18ef65526 100644 --- a/libavfilter/f_graphmonitor.c +++ b/libavfilter/f_graphmonitor.c @@ -27,6 +27,7 @@ #include "libavutil/timestamp.h" #include "libavutil/xga_font_data.h" #include "avfilter.h" +#include "config_components.h" #include "filters.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/f_interleave.c b/libavfilter/f_interleave.c index b60e89762f..4c160a40e0 100644 --- a/libavfilter/f_interleave.c +++ b/libavfilter/f_interleave.c @@ -28,6 +28,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "filters.h" #include "internal.h" diff --git a/libavfilter/f_latency.c b/libavfilter/f_latency.c index 6f16d6677e..597d2cb259 100644 --- a/libavfilter/f_latency.c +++ b/libavfilter/f_latency.c @@ -20,6 +20,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "config_components.h" #include "filters.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/f_loop.c b/libavfilter/f_loop.c index f8ae4a6a3a..48eddb14fa 100644 --- a/libavfilter/f_loop.c +++ b/libavfilter/f_loop.c @@ -24,6 +24,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "config_components.h" #include "filters.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index 5f5091e9b7..21c2abb7c3 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -34,6 +34,7 @@ #include "libavformat/avio.h" #include "avfilter.h" #include "audio.h" +#include "config_components.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/f_perms.c b/libavfilter/f_perms.c index 5e2f4ecdf4..f98bb2c649 100644 --- a/libavfilter/f_perms.c +++ b/libavfilter/f_perms.c @@ -22,6 +22,7 @@ #include "libavutil/opt.h" #include "libavutil/random_seed.h" #include "audio.h" +#include "config_components.h" #include "video.h" enum mode { diff --git a/libavfilter/f_realtime.c b/libavfilter/f_realtime.c index 9a60ded0ca..4edadad892 100644 --- a/libavfilter/f_realtime.c +++ b/libavfilter/f_realtime.c @@ -21,6 +21,7 @@ #include "libavutil/opt.h" #include "libavutil/time.h" #include "avfilter.h" +#include "config_components.h" #include "internal.h" #include diff --git a/libavfilter/f_reverse.c b/libavfilter/f_reverse.c index f7a7e716fa..35748b8116 100644 --- a/libavfilter/f_reverse.c +++ b/libavfilter/f_reverse.c @@ -20,6 +20,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/f_segment.c b/libavfilter/f_segment.c index 5f44634803..4579bce2da 100644 --- a/libavfilter/f_segment.c +++ b/libavfilter/f_segment.c @@ -29,6 +29,7 @@ #include "audio.h" #include "avfilter.h" +#include "config_components.h" #include "filters.h" #include "internal.h" diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c index b61d88f4fe..a039e742eb 100644 --- a/libavfilter/f_select.c +++ b/libavfilter/f_select.c @@ -32,6 +32,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "audio.h" +#include "config_components.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/f_sendcmd.c b/libavfilter/f_sendcmd.c index 7261a05aae..a6b40d6b03 100644 --- a/libavfilter/f_sendcmd.c +++ b/libavfilter/f_sendcmd.c @@ -30,6 +30,7 @@ #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "avfilter.h" +#include "config_components.h" #include "internal.h" #include "audio.h" #include "video.h" diff --git a/libavfilter/f_sidedata.c b/libavfilter/f_sidedata.c index 8eccd4a06e..d126c4d656 100644 --- a/libavfilter/f_sidedata.c +++ b/libavfilter/f_sidedata.c @@ -26,6 +26,7 @@ #include "libavutil/frame.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/lut3d.h b/libavfilter/lut3d.h index bc32eac91c..b217e81bdc 100644 --- a/libavfilter/lut3d.h +++ b/libavfilter/lut3d.h @@ -24,6 +24,7 @@ #include "libavutil/pixdesc.h" #include "framesync.h" #include "avfilter.h" +#include "config_components.h" enum interp_mode { INTERPOLATE_NEAREST, diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index 054feb05f1..58f0d13452 100644 --- a/libavfilter/setpts.c +++ b/libavfilter/setpts.c @@ -33,6 +33,7 @@ #include "libavutil/time.h" #include "audio.h" #include "avfilter.h" +#include "config_components.h" #include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/settb.c b/libavfilter/settb.c index 67d310afbd..94461cc354 100644 --- a/libavfilter/settb.c +++ b/libavfilter/settb.c @@ -34,6 +34,7 @@ #include "libavutil/rational.h" #include "audio.h" #include "avfilter.h" +#include "config_components.h" #include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index b89a680883..76d33fc6f4 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -44,6 +44,7 @@ #include "audio.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "internal.h" #include "video.h" 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..0a49d2f5d1 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -33,6 +33,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "config_components.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 2d433e439f..0bc1932491 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -24,6 +24,7 @@ #include "libavutil/opt.h" #include "libavutil/pixfmt.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "framesync.h" #include "internal.h" diff --git a/libavfilter/vf_colorconstancy.c b/libavfilter/vf_colorconstancy.c index ba6359462e..1150801eda 100644 --- a/libavfilter/vf_colorconstancy.c +++ b/libavfilter/vf_colorconstancy.c @@ -33,6 +33,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_colorkey.c b/libavfilter/vf_colorkey.c index ed43722c03..6d1cc0c957 100644 --- a/libavfilter/vf_colorkey.c +++ b/libavfilter/vf_colorkey.c @@ -21,6 +21,7 @@ #include "libavutil/opt.h" #include "libavutil/imgutils.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c index 6e6fe0d887..278eb75b0a 100644 --- a/libavfilter/vf_convolution.c +++ b/libavfilter/vf_convolution.c @@ -26,6 +26,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "config_components.h" #include "convolution.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/vf_convolve.c b/libavfilter/vf_convolve.c index 55afb582b4..a5e7b70932 100644 --- a/libavfilter/vf_convolve.c +++ b/libavfilter/vf_convolve.c @@ -26,6 +26,7 @@ #include "libavutil/tx.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "framesync.h" #include "internal.h" diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c index 919652e50f..62cb51453b 100644 --- a/libavfilter/vf_drawbox.c +++ b/libavfilter/vf_drawbox.c @@ -33,6 +33,7 @@ #include "libavutil/parseutils.h" #include "libavutil/detection_bbox.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c index 5b5fd6e232..338e876ccf 100644 --- a/libavfilter/vf_extractplanes.c +++ b/libavfilter/vf_extractplanes.c @@ -24,6 +24,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "config_components.h" #include "drawutils.h" #include "filters.h" #include "internal.h" diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index c78acbf87b..c26a96d806 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -31,6 +31,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index bf80b2c4fc..0813e42610 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -25,6 +25,7 @@ #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_identity.c b/libavfilter/vf_identity.c index cc30761388..b84b4c2fa5 100644 --- a/libavfilter/vf_identity.c +++ b/libavfilter/vf_identity.c @@ -27,6 +27,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "config_components.h" #include "drawutils.h" #include "formats.h" #include "framesync.h" diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index fd5b364797..19cc0f67ab 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -31,6 +31,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "config_components.h" #include "drawutils.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/vf_lut2.c b/libavfilter/vf_lut2.c index 868c0496fa..dd21d24b2f 100644 --- a/libavfilter/vf_lut2.c +++ b/libavfilter/vf_lut2.c @@ -24,6 +24,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "config_components.h" #include "drawutils.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index 8206517579..20e5a0dd9c 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -25,6 +25,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "internal.h" #include "framesync.h" diff --git a/libavfilter/vf_neighbor.c b/libavfilter/vf_neighbor.c index f48fb306b2..5a06d0d92f 100644 --- a/libavfilter/vf_neighbor.c +++ b/libavfilter/vf_neighbor.c @@ -24,6 +24,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_premultiply.c b/libavfilter/vf_premultiply.c index 4b60de7b7b..8c417c83ae 100644 --- a/libavfilter/vf_premultiply.c +++ b/libavfilter/vf_premultiply.c @@ -22,6 +22,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "config_components.h" #include "filters.h" #include "formats.h" #include "framesync.h" diff --git a/libavfilter/vf_setparams.c b/libavfilter/vf_setparams.c index b3893adc13..09e3217d46 100644 --- a/libavfilter/vf_setparams.c +++ b/libavfilter/vf_setparams.c @@ -21,6 +21,7 @@ #include "libavutil/pixfmt.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "config_components.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_stack.c b/libavfilter/vf_stack.c index f584e8349b..c981829e4e 100644 --- a/libavfilter/vf_stack.c +++ b/libavfilter/vf_stack.c @@ -25,6 +25,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "config_components.h" #include "drawutils.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/vf_xmedian.c b/libavfilter/vf_xmedian.c index 148ab555bb..ff2d22610f 100644 --- a/libavfilter/vf_xmedian.c +++ b/libavfilter/vf_xmedian.c @@ -26,6 +26,7 @@ #include "libavutil/qsort.h" #include "avfilter.h" +#include "config_components.h" #include "formats.h" #include "internal.h" #include "framesync.h" diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index 20b915d472..8c03e5103c 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -44,6 +44,7 @@ #include "libavutil/parseutils.h" #include "libavutil/xga_font_data.h" #include "avfilter.h" +#include "config_components.h" #include "drawutils.h" #include "filters.h" #include "formats.h" diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c index ad9b65a9be..89a9e82310 100644 --- a/libavformat/ac3dec.c +++ b/libavformat/ac3dec.c @@ -23,6 +23,7 @@ #include "libavutil/crc.h" #include "libavcodec/ac3_parser.h" #include "avformat.h" +#include "config_components.h" #include "rawdec.h" static int ac3_eac3_probe(const AVProbeData *p, enum AVCodecID expected_codec_id) diff --git a/libavformat/alp.c b/libavformat/alp.c index f46bdb4511..fc95f5ecb2 100644 --- a/libavformat/alp.c +++ b/libavformat/alp.c @@ -22,6 +22,7 @@ #include "libavutil/channel_layout.h" #include "avformat.h" +#include "config_components.h" #include "internal.h" #include "rawenc.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/amr.c b/libavformat/amr.c index bc22c2f84f..63efc159cd 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -27,6 +27,7 @@ Write and read amr data according to RFC3267, http://www.ietf.org/rfc/rfc3267.tx #include "libavutil/intreadwrite.h" #include "avformat.h" #include "avio_internal.h" +#include "config_components.h" #include "internal.h" #include "rawdec.h" #include "rawenc.h" diff --git a/libavformat/apm.c b/libavformat/apm.c index 1ced771745..c72d9abfe4 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" +#include "config_components.h" #include "internal.h" #include "rawenc.h" #include "libavutil/channel_layout.h" diff --git a/libavformat/aptxdec.c b/libavformat/aptxdec.c index 7153e262a1..7afdc816d7 100644 --- a/libavformat/aptxdec.c +++ b/libavformat/aptxdec.c @@ -22,6 +22,7 @@ #include "libavutil/opt.h" #include "avformat.h" +#include "config_components.h" #define APTX_BLOCK_SIZE 4 #define APTX_PACKET_SIZE (256*APTX_BLOCK_SIZE) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 2b3569ebc3..53d498a3de 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -21,6 +21,7 @@ */ #include "libavutil/avstring.h" #include "avformat.h" +#include "config_components.h" #include "internal.h" #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/argo_cvg.c b/libavformat/argo_cvg.c index f59e93496f..e807c07de6 100644 --- a/libavformat/argo_cvg.c +++ b/libavformat/argo_cvg.c @@ -23,6 +23,7 @@ #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "avformat.h" +#include "config_components.h" #include "internal.h" #include "libavutil/opt.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 041019b186..4db57bdd1f 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -26,6 +26,7 @@ #include "avformat.h" #include "avlanguage.h" #include "avio_internal.h" +#include "config_components.h" #include "internal.h" #include "riff.h" #include "asf.h" diff --git a/libavformat/au.c b/libavformat/au.c index 9bd408f65c..95ca3901a8 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -29,6 +29,7 @@ #include "libavutil/bprint.h" #include "avformat.h" +#include "config_components.h" #include "internal.h" #include "avio_internal.h" #include "pcm.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 0f0e6846da..c9eb635dc8 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -30,6 +30,7 @@ #include "libavutil/mathematics.h" #include "avformat.h" #include "avi.h" +#include "config_components.h" #include "dv.h" #include "internal.h" #include "isom.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..5e58b16f23 100644 --- a/libavformat/bintext.c +++ b/libavformat/bintext.c @@ -34,6 +34,7 @@ #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "avformat.h" +#include "config_components.h" #include "internal.h" #include "sauce.h" #include "libavcodec/bintext.h" diff --git a/libavformat/bit.c b/libavformat/bit.c index 380cbd37cd..73f98603bc 100644 --- a/libavformat/bit.c +++ b/libavformat/bit.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" +#include "config_components.h" #include "internal.h" #include "libavcodec/get_bits.h" #include "libavcodec/put_bits.h" diff --git a/libavformat/codec2.c b/libavformat/codec2.c index 0b992836b3..26be9713d0 100644 --- a/libavformat/codec2.c +++ b/libavformat/codec2.c @@ -26,6 +26,7 @@ #include "libavutil/opt.h" #include "avio_internal.h" #include "avformat.h" +#include "config_components.h" #include "internal.h" #include "rawenc.h" #include "pcm.h" diff --git a/libavformat/concat.c b/libavformat/concat.c index faeba2293a..d8d3c1a7c6 100644 --- a/libavformat/concat.c +++ b/libavformat/concat.c @@ -27,6 +27,7 @@ #include "avformat.h" #include "avio_internal.h" +#include "config_components.h" #include "url.h" #define AV_CAT_SEPARATOR "|" 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..4b9498c591 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -23,6 +23,7 @@ #include "libavutil/internal.h" #include "libavutil/opt.h" #include "avformat.h" +#include "config_components.h" #if HAVE_DIRENT_H #include #endif diff --git a/libavformat/format.c b/libavformat/format.c index 52b85c16a2..151fd4ad70 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -26,6 +26,7 @@ #include "avio_internal.h" #include "avformat.h" +#include "config_components.h" #include "id3v2.h" #include "internal.h" diff --git a/libavformat/g726.c b/libavformat/g726.c index 4b08d0a9f7..5add1a8084 100644 --- a/libavformat/g726.c +++ b/libavformat/g726.c @@ -20,6 +20,7 @@ */ #include "avformat.h" +#include "config_components.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..7953adc8c8 100644 --- a/libavformat/hashenc.c +++ b/libavformat/hashenc.c @@ -24,6 +24,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" #include "avformat.h" +#include "config_components.h" #include "internal.h" struct HashContext { diff --git a/libavformat/hls.c b/libavformat/hls.c index 06bc46c23f..52d26709f2 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -36,6 +36,7 @@ #include "libavutil/dict.h" #include "libavutil/time.h" #include "avformat.h" +#include "config_components.h" #include "internal.h" #include "avio_internal.h" #include "id3v2.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..4c2504af13 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -33,6 +33,7 @@ #include "libavutil/parseutils.h" #include "avformat.h" +#include "config_components.h" #include "http.h" #include "httpauth.h" #include "internal.h" diff --git a/libavformat/ilbc.c b/libavformat/ilbc.c index 0cbdd3d5b8..eb3300654a 100644 --- a/libavformat/ilbc.c +++ b/libavformat/ilbc.c @@ -20,6 +20,7 @@ */ #include "avformat.h" +#include "config_components.h" #include "internal.h" #include "rawenc.h" diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 8608252d83..7ffe0d7edb 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -32,6 +32,7 @@ #include "libavcodec/gif.h" #include "avformat.h" #include "avio_internal.h" +#include "config_components.h" #include "internal.h" #include "img2.h" #include "libavcodec/mjpeg.h" diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index ded91d6b98..17a1bcf68c 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -29,6 +29,7 @@ #include "libavutil/time_internal.h" #include "avformat.h" #include "avio_internal.h" +#include "config_components.h" #include "internal.h" #include "img2.h" diff --git a/libavformat/kvag.c b/libavformat/kvag.c index a277c28128..0fbda0e95a 100644 --- a/libavformat/kvag.c +++ b/libavformat/kvag.c @@ -23,6 +23,7 @@ #include "libavutil/channel_layout.h" #include "avformat.h" #include "avio_internal.h" +#include "config_components.h" #include "internal.h" #include "rawenc.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 31e5111225..ba20c2f6fb 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..416f45f11f 100644 --- a/libavformat/mj2kdec.c +++ b/libavformat/mj2kdec.c @@ -21,6 +21,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "config_components.h" #include "rawdec.h" #if CONFIG_MJPEG_2000_DEMUXER diff --git a/libavformat/mlpdec.c b/libavformat/mlpdec.c index f0996fef31..4402d46c2d 100644 --- a/libavformat/mlpdec.c +++ b/libavformat/mlpdec.c @@ -23,6 +23,7 @@ #include "avformat.h" #include "avio_internal.h" +#include "config_components.h" #include "internal.h" #include "rawdec.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/mmf.c b/libavformat/mmf.c index e836390bff..1958577b68 100644 --- a/libavformat/mmf.c +++ b/libavformat/mmf.c @@ -22,6 +22,7 @@ #include "libavutil/channel_layout.h" #include "avformat.h" #include "avio_internal.h" +#include "config_components.h" #include "internal.h" #include "pcm.h" #include "rawenc.h" diff --git a/libavformat/mov.c b/libavformat/mov.c index 5e26267810..fb35e0024b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -53,6 +53,7 @@ #include "libavcodec/mpegaudiodecheader.h" #include "libavcodec/mlp_parse.h" #include "avformat.h" +#include "config_components.h" #include "internal.h" #include "avio_internal.h" #include "dovi_isom.h" diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 14482abe8d..3885bba433 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -27,6 +27,7 @@ #include "movenc.h" #include "avformat.h" #include "avio_internal.h" +#include "config_components.h" #include "dovi_isom.h" #include "riff.h" #include "avio.h" diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index ca15d9f241..6c74b32df4 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -22,6 +22,7 @@ #include "libavutil/channel_layout.h" #include "avformat.h" #include "avio_internal.h" +#include "config_components.h" #include "internal.h" #include "mpeg.h" diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 64248695bd..bd01331ccd 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -31,6 +31,7 @@ #include "avformat.h" #include "avio_internal.h" +#include "config_components.h" #include "internal.h" #include "mpeg.h" diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index e23f596490..993230d49d 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -34,6 +34,7 @@ #include "libavcodec/get_bits.h" #include "libavcodec/opus.h" #include "avformat.h" +#include "config_components.h" #include "mpegts.h" #include "internal.h" #include "avio_internal.h" diff --git a/libavformat/network.c b/libavformat/network.c index 96fe636745..001ed0ad52 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -19,6 +19,7 @@ */ #include +#include "config_components.h" #include "network.h" #include "tls.h" #include "url.h" diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 31f47dadf6..eee180d709 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -30,6 +30,7 @@ #include "libavcodec/flac.h" #include "avformat.h" #include "avio_internal.h" +#include "config_components.h" #include "internal.h" #include "version.h" #include "vorbiscomment.h" diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c index 63539a47c0..457669763d 100644 --- a/libavformat/pcmdec.c +++ b/libavformat/pcmdec.c @@ -21,6 +21,7 @@ #include "libavutil/avstring.h" #include "avformat.h" +#include "config_components.h" #include "internal.h" #include "pcm.h" #include "libavutil/log.h" diff --git a/libavformat/pcmenc.c b/libavformat/pcmenc.c index cbfcee7b41..d322eb9085 100644 --- a/libavformat/pcmenc.c +++ b/libavformat/pcmenc.c @@ -20,6 +20,7 @@ */ #include "avformat.h" +#include "config_components.h" #include "rawenc.h" #define PCMDEF_0(name_, long_name_, ext, codec) diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 15e26c03bd..848f19de1c 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -20,6 +20,7 @@ * 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 4bbae7717b..57da29c606 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -23,6 +23,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "config_components.h" #include "rawenc.h" #include "internal.h" diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c index 7b1a534452..dbf975a89e 100644 --- a/libavformat/rawvideodec.c +++ b/libavformat/rawvideodec.c @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "internal.h" #include "avformat.h" +#include "config_components.h" typedef struct RawVideoDemuxerContext { const AVClass *class; /**< Class for private options. */ diff --git a/libavformat/riff.c b/libavformat/riff.c index 27a9706510..6e0a02fa78 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "config_components.h" #include "libavutil/common.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 88557140f7..b17adfa843 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -33,6 +33,7 @@ #include "libavutil/opt.h" #include "libavutil/random_seed.h" #include "avformat.h" +#include "config_components.h" #include "internal.h" #include "network.h" diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index f1992f193e..42019294ed 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -32,6 +32,7 @@ #include "libavutil/time.h" #include "avformat.h" #include "avio_internal.h" +#include "config_components.h" #if HAVE_POLL_H #include diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index eee6329025..662af221df 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -25,6 +25,7 @@ #include "libavutil/random_seed.h" #include "libavutil/time.h" #include "avformat.h" +#include "config_components.h" #include "internal.h" #include "network.h" diff --git a/libavformat/sdp.c b/libavformat/sdp.c index d63a0b34c4..9992c25610 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -27,6 +27,7 @@ #include "libavcodec/xiph.h" #include "libavcodec/mpeg4audio.h" #include "avformat.h" +#include "config_components.h" #include "internal.h" #include "avc.h" #include "hevc.h" diff --git a/libavformat/segment.c b/libavformat/segment.c index e9b0aa4fa8..a7144f739f 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -29,6 +29,7 @@ #include "avformat.h" #include "avio_internal.h" +#include "config_components.h" #include "internal.h" #include "libavutil/avassert.h" diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index 9eb22ee9b3..d850557117 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -24,6 +24,7 @@ #include "libavutil/avassert.h" #include "libavutil/fifo.h" #include "avformat.h" +#include "config_components.h" #include "flv.h" #include "swf.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..4e703354ea 100644 --- a/libavformat/wavenc.c +++ b/libavformat/wavenc.c @@ -43,6 +43,7 @@ #include "avformat.h" #include "avio.h" #include "avio_internal.h" +#include "config_components.h" #include "internal.h" #include "riff.h"