diff options
author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-08-01 08:36:09 +0200 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-24 12:56:49 +0100 |
commit | 636631d9db82f5e86330ab42dacc8a106684b349 (patch) | |
tree | 86274afefd600d2ef634dc8d1252807ce9f16721 /libavformat | |
parent | 84f16bb5e68dc47eca4dc96b3391c58471cd7328 (diff) |
Remove unnecessary libavutil/(avutil|common|internal).h inclusions
Some of these were made possible by moving several common macros to
libavutil/macros.h.
While just at it, also improve the other headers a bit.
Reviewed-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/argo_asf.h | 2 | ||||
-rw-r--r-- | libavformat/asfcrypt.c | 3 | ||||
-rw-r--r-- | libavformat/avlanguage.c | 3 | ||||
-rw-r--r-- | libavformat/hlsplaylist.h | 1 | ||||
-rw-r--r-- | libavformat/matroska.h | 2 | ||||
-rw-r--r-- | libavformat/network.c | 1 | ||||
-rw-r--r-- | libavformat/riff.c | 3 | ||||
-rw-r--r-- | libavformat/tee_common.c | 5 | ||||
-rw-r--r-- | libavformat/webmdashenc.c | 2 | ||||
-rw-r--r-- | libavformat/wv.c | 3 |
10 files changed, 14 insertions, 11 deletions
diff --git a/libavformat/argo_asf.h b/libavformat/argo_asf.h index 1fab31a90b..948459d0b7 100644 --- a/libavformat/argo_asf.h +++ b/libavformat/argo_asf.h @@ -24,7 +24,7 @@ #define AVFORMAT_ARGO_ASF_H #include <stdint.h> -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "avformat.h" diff --git a/libavformat/asfcrypt.c b/libavformat/asfcrypt.c index 221a8a89bc..c77e37503e 100644 --- a/libavformat/asfcrypt.c +++ b/libavformat/asfcrypt.c @@ -20,10 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stddef.h> #include "libavutil/bswap.h" -#include "libavutil/common.h" #include "libavutil/des.h" #include "libavutil/intreadwrite.h" +#include "libavutil/mem.h" #include "libavutil/rc4.h" #include "asfcrypt.h" diff --git a/libavformat/avlanguage.c b/libavformat/avlanguage.c index c36893c999..782a58adb2 100644 --- a/libavformat/avlanguage.c +++ b/libavformat/avlanguage.c @@ -19,8 +19,7 @@ */ #include "avlanguage.h" -#include "libavutil/avstring.h" -#include "libavutil/common.h" +#include "libavutil/macros.h" #include <stdlib.h> #include <stdint.h> #include <string.h> diff --git a/libavformat/hlsplaylist.h b/libavformat/hlsplaylist.h index 29487da3ed..1928fe787d 100644 --- a/libavformat/hlsplaylist.h +++ b/libavformat/hlsplaylist.h @@ -25,7 +25,6 @@ #include <stdint.h> -#include "libavutil/common.h" #include "avformat.h" #include "avio.h" diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 16491aae22..45077ed33f 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -23,8 +23,8 @@ #define AVFORMAT_MATROSKA_H #include "libavcodec/codec_id.h" +#include "avformat.h" #include "metadata.h" -#include "internal.h" /* EBML version supported */ #define EBML_VERSION 1 diff --git a/libavformat/network.c b/libavformat/network.c index 96fe636745..1ced314c92 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -22,7 +22,6 @@ #include "network.h" #include "tls.h" #include "url.h" -#include "libavutil/avutil.h" #include "libavutil/avassert.h" #include "libavutil/mem.h" #include "libavutil/time.h" diff --git a/libavformat/riff.c b/libavformat/riff.c index 27a9706510..0c19d3f784 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -19,8 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stddef.h> #include "config.h" -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "avformat.h" #include "internal.h" #include "metadata.h" diff --git a/libavformat/tee_common.c b/libavformat/tee_common.c index a9608871b5..e516b0a603 100644 --- a/libavformat/tee_common.c +++ b/libavformat/tee_common.c @@ -19,8 +19,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avutil.h" -#include "libavutil/avstring.h" +#include <string.h> + +#include "libavutil/log.h" #include "libavutil/opt.h" #include "tee_common.h" diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index cf69bd35b1..a942c484e9 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -38,6 +38,8 @@ #include "libavutil/opt.h" #include "libavutil/time_internal.h" +#include "libavcodec/codec_desc.h" + typedef struct AdaptationSet { char id[10]; int *streams; diff --git a/libavformat/wv.c b/libavformat/wv.c index 0f4f80761a..b260bb9fc3 100644 --- a/libavformat/wv.c +++ b/libavformat/wv.c @@ -21,8 +21,9 @@ #include <stdint.h> #include <string.h> -#include "libavutil/common.h" +#include "libavutil/error.h" #include "libavutil/intreadwrite.h" +#include "libavutil/macros.h" #include "wv.h" |