From e7bd47e657bbf9e1ce9915e93bc80cb1a29fb7f3 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 11 Jun 2021 21:54:31 +0200 Subject: [PATCH] Remove obsolete version.h inclusions These have mostly been added because of FF_API_*; yet when these were removed, removing the header has been forgotten. Signed-off-by: Andreas Rheinhardt --- libavcodec/blockdsp.c | 1 - libavcodec/blockdsp.h | 1 - libavcodec/codec_desc.c | 1 - libavcodec/error_resilience.c | 1 - libavcodec/mpegutils.h | 1 - libavcodec/utils.c | 1 - libavfilter/formats.h | 1 - libavformat/hlsproto.c | 1 - libavutil/aes.h | 1 - libavutil/aes_ctr.h | 1 - libavutil/buffer.h | 2 -- libavutil/crc.h | 1 - libavutil/dict.h | 2 -- libavutil/hash.h | 2 -- libavutil/hmac.c | 1 - libavutil/hmac.h | 1 - libavutil/lls.c | 1 - libavutil/lls.h | 1 - libavutil/log.h | 1 - libavutil/mathematics.c | 1 - libavutil/md5.h | 1 - libavutil/murmur3.h | 2 -- libavutil/opt.h | 1 - libavutil/pixdesc.c | 1 - libavutil/pixdesc.h | 1 - libavutil/ripemd.h | 1 - libavutil/sha.h | 1 - libavutil/sha512.h | 1 - libavutil/tree.h | 1 - 29 files changed, 33 deletions(-) diff --git a/libavcodec/blockdsp.c b/libavcodec/blockdsp.c index c7efe7e77b..5fb242ea65 100644 --- a/libavcodec/blockdsp.c +++ b/libavcodec/blockdsp.c @@ -23,7 +23,6 @@ #include "libavutil/attributes.h" #include "avcodec.h" #include "blockdsp.h" -#include "version.h" static void clear_block_c(int16_t *block) { diff --git a/libavcodec/blockdsp.h b/libavcodec/blockdsp.h index 26fc2ea13b..58eecffb07 100644 --- a/libavcodec/blockdsp.h +++ b/libavcodec/blockdsp.h @@ -23,7 +23,6 @@ #include #include "avcodec.h" -#include "version.h" /* add and put pixel (decoding) * Block sizes for op_pixels_func are 8x4,8x8 16x8 16x16. diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 35527dcc37..674f4bf8c3 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -27,7 +27,6 @@ #include "codec_id.h" #include "codec_desc.h" #include "profiles.h" -#include "version.h" #define MT(...) (const char *const[]){ __VA_ARGS__, NULL } diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 68bc10ac31..f13be7b918 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -35,7 +35,6 @@ #include "mpegvideo.h" #include "rectangle.h" #include "thread.h" -#include "version.h" /** * @param stride the number of MVs to get to the next row diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index 81f0b73bb1..5aeff47bbd 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -26,7 +26,6 @@ #include "libavutil/frame.h" #include "avcodec.h" -#include "version.h" /** * Return value for header parsers if frame is not coded. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b2f0d2a497..5fad782f5a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -41,7 +41,6 @@ #include "internal.h" #include "put_bits.h" #include "raw.h" -#include "version.h" #include #include #include diff --git a/libavfilter/formats.h b/libavfilter/formats.h index 3a6044971b..65acc939e3 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -20,7 +20,6 @@ #define AVFILTER_FORMATS_H #include "avfilter.h" -#include "version.h" /** * A list of supported formats for one end of a filter link. This is used diff --git a/libavformat/hlsproto.c b/libavformat/hlsproto.c index 9e78f931e8..6a2765bbe9 100644 --- a/libavformat/hlsproto.c +++ b/libavformat/hlsproto.c @@ -31,7 +31,6 @@ #include "avio_internal.h" #include "internal.h" #include "url.h" -#include "version.h" /* * An apple http stream consists of a playlist with media segment files, diff --git a/libavutil/aes.h b/libavutil/aes.h index 09efbda107..d243286c86 100644 --- a/libavutil/aes.h +++ b/libavutil/aes.h @@ -24,7 +24,6 @@ #include #include "attributes.h" -#include "version.h" /** * @defgroup lavu_aes AES diff --git a/libavutil/aes_ctr.h b/libavutil/aes_ctr.h index e4aae126a7..4e9fda7aca 100644 --- a/libavutil/aes_ctr.h +++ b/libavutil/aes_ctr.h @@ -25,7 +25,6 @@ #include #include "attributes.h" -#include "version.h" #define AES_CTR_KEY_SIZE (16) #define AES_CTR_IV_SIZE (8) diff --git a/libavutil/buffer.h b/libavutil/buffer.h index 63ab87eb72..2c0ce1a108 100644 --- a/libavutil/buffer.h +++ b/libavutil/buffer.h @@ -28,8 +28,6 @@ #include #include -#include "version.h" - /** * @defgroup lavu_buffer AVBuffer * @ingroup lavu_data diff --git a/libavutil/crc.h b/libavutil/crc.h index 47e22b4c78..24a2e3caed 100644 --- a/libavutil/crc.h +++ b/libavutil/crc.h @@ -30,7 +30,6 @@ #include #include #include "attributes.h" -#include "version.h" /** * @defgroup lavu_crc32 CRC diff --git a/libavutil/dict.h b/libavutil/dict.h index 118f1f00ed..0d1afc6c64 100644 --- a/libavutil/dict.h +++ b/libavutil/dict.h @@ -32,8 +32,6 @@ #include -#include "version.h" - /** * @addtogroup lavu_dict AVDictionary * @ingroup lavu_data diff --git a/libavutil/hash.h b/libavutil/hash.h index 930d2d6cde..94151ded7c 100644 --- a/libavutil/hash.h +++ b/libavutil/hash.h @@ -30,8 +30,6 @@ #include #include -#include "version.h" - /** * @defgroup lavu_hash Hash Functions * @ingroup lavu_crypto diff --git a/libavutil/hmac.c b/libavutil/hmac.c index e277fd7701..7d241fc73e 100644 --- a/libavutil/hmac.c +++ b/libavutil/hmac.c @@ -28,7 +28,6 @@ #include "sha.h" #include "sha512.h" #include "mem.h" -#include "version.h" #define MAX_HASHLEN 64 #define MAX_BLOCKLEN 128 diff --git a/libavutil/hmac.h b/libavutil/hmac.h index 412e950719..ca4da6a689 100644 --- a/libavutil/hmac.h +++ b/libavutil/hmac.h @@ -23,7 +23,6 @@ #include -#include "version.h" /** * @defgroup lavu_hmac HMAC * @ingroup lavu_crypto diff --git a/libavutil/lls.c b/libavutil/lls.c index 0560b6a79c..3a136baa2d 100644 --- a/libavutil/lls.c +++ b/libavutil/lls.c @@ -30,7 +30,6 @@ #include "attributes.h" #include "internal.h" -#include "version.h" #include "lls.h" static void update_lls(LLSModel *m, const double *var) diff --git a/libavutil/lls.h b/libavutil/lls.h index 5f849206f7..0709275822 100644 --- a/libavutil/lls.h +++ b/libavutil/lls.h @@ -25,7 +25,6 @@ #include "macros.h" #include "mem_internal.h" -#include "version.h" #define MAX_VARS 32 #define MAX_VARS_ALIGN FFALIGN(MAX_VARS+1,4) diff --git a/libavutil/log.h b/libavutil/log.h index c2f1232a16..8727c38afc 100644 --- a/libavutil/log.h +++ b/libavutil/log.h @@ -24,7 +24,6 @@ #include #include "avutil.h" #include "attributes.h" -#include "version.h" typedef enum { AV_CLASS_CATEGORY_NA = 0, diff --git a/libavutil/mathematics.c b/libavutil/mathematics.c index 2de2b39da0..f4e541fa24 100644 --- a/libavutil/mathematics.c +++ b/libavutil/mathematics.c @@ -30,7 +30,6 @@ #include "libavutil/intmath.h" #include "libavutil/common.h" #include "avassert.h" -#include "version.h" /* Stein's binary GCD algorithm: * https://en.wikipedia.org/wiki/Binary_GCD_algorithm */ diff --git a/libavutil/md5.h b/libavutil/md5.h index eee6af44df..fc2eabdb16 100644 --- a/libavutil/md5.h +++ b/libavutil/md5.h @@ -31,7 +31,6 @@ #include #include "attributes.h" -#include "version.h" /** * @defgroup lavu_md5 MD5 diff --git a/libavutil/murmur3.h b/libavutil/murmur3.h index c5cd7e49e0..d90bc2fcd1 100644 --- a/libavutil/murmur3.h +++ b/libavutil/murmur3.h @@ -30,8 +30,6 @@ #include #include -#include "version.h" - /** * @defgroup lavu_murmur3 Murmur3 * @ingroup lavu_hash diff --git a/libavutil/opt.h b/libavutil/opt.h index c2329e5589..9e1e8ede06 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -33,7 +33,6 @@ #include "log.h" #include "pixfmt.h" #include "samplefmt.h" -#include "version.h" /** * @defgroup avoptions AVOptions diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 751843e991..2346138d04 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -29,7 +29,6 @@ #include "pixdesc.h" #include "internal.h" #include "intreadwrite.h" -#include "version.h" void av_read_image_line2(void *dst, const uint8_t *data[4], const int linesize[4], diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index 9e7cfad983..f8a195ffcd 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -26,7 +26,6 @@ #include "attributes.h" #include "pixfmt.h" -#include "version.h" typedef struct AVComponentDescriptor { /** diff --git a/libavutil/ripemd.h b/libavutil/ripemd.h index 8c24b72855..9df9f905f3 100644 --- a/libavutil/ripemd.h +++ b/libavutil/ripemd.h @@ -32,7 +32,6 @@ #include #include "attributes.h" -#include "version.h" /** * @defgroup lavu_ripemd RIPEMD diff --git a/libavutil/sha.h b/libavutil/sha.h index 85356218b9..2e1220abd1 100644 --- a/libavutil/sha.h +++ b/libavutil/sha.h @@ -31,7 +31,6 @@ #include #include "attributes.h" -#include "version.h" /** * @defgroup lavu_sha SHA diff --git a/libavutil/sha512.h b/libavutil/sha512.h index 30dd8744f8..a4a3f23db3 100644 --- a/libavutil/sha512.h +++ b/libavutil/sha512.h @@ -32,7 +32,6 @@ #include #include "attributes.h" -#include "version.h" /** * @defgroup lavu_sha512 SHA-512 diff --git a/libavutil/tree.h b/libavutil/tree.h index d5e0aebfbd..bbb8fbb126 100644 --- a/libavutil/tree.h +++ b/libavutil/tree.h @@ -28,7 +28,6 @@ #define AVUTIL_TREE_H #include "attributes.h" -#include "version.h" /** * @addtogroup lavu_tree AVTree