diff options
author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-06-14 18:03:55 +0200 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-07-22 15:29:46 +0200 |
commit | 25c8507818d8559a6654a5b30a0f8aae11a48181 (patch) | |
tree | 59f768e70e21d07f26a97724a2022c6d855cfcf1 /libavformat | |
parent | e3023e901524d1f9f59167962ee47672e61c2bc9 (diff) |
Remove/replace some unnecessary avcodec.h inclusions
Also remove other unnecessary headers and include headers directly while
at it.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/mxf.c | 1 | ||||
-rw-r--r-- | libavformat/mxf.h | 5 | ||||
-rw-r--r-- | libavformat/riff.c | 5 | ||||
-rw-r--r-- | libavformat/riff.h | 1 | ||||
-rw-r--r-- | libavformat/riffdec.c | 5 | ||||
-rw-r--r-- | libavformat/rtp.h | 6 | ||||
-rw-r--r-- | libavformat/rtpdec.h | 3 | ||||
-rw-r--r-- | libavformat/rtpdec_qdm2.c | 1 | ||||
-rw-r--r-- | libavformat/vpcc.c | 1 | ||||
-rw-r--r-- | libavformat/vpcc.h | 4 |
10 files changed, 18 insertions, 14 deletions
diff --git a/libavformat/mxf.c b/libavformat/mxf.c index 7c355d789b..36d662b58c 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -20,6 +20,7 @@ */ #include "libavutil/common.h" +#include "libavcodec/codec_id.h" #include "mxf.h" const uint8_t ff_mxf_random_index_pack_key[16] = { 0x06,0x0e,0x2b,0x34,0x02,0x05,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x11,0x01,0x00 }; diff --git a/libavformat/mxf.h b/libavformat/mxf.h index b1b1fedac7..eb473d8a55 100644 --- a/libavformat/mxf.h +++ b/libavformat/mxf.h @@ -21,9 +21,10 @@ #ifndef AVFORMAT_MXF_H #define AVFORMAT_MXF_H -#include "avformat.h" -#include "libavcodec/avcodec.h" #include <stdint.h> +#include "libavutil/log.h" +#include "libavutil/pixfmt.h" +#include "libavutil/rational.h" typedef uint8_t UID[16]; diff --git a/libavformat/riff.c b/libavformat/riff.c index 270ff7c024..423926e3bd 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -20,9 +20,10 @@ */ #include "config.h" -#include "libavutil/error.h" -#include "libavcodec/avcodec.h" +#include "libavutil/common.h" #include "avformat.h" +#include "internal.h" +#include "metadata.h" #include "riff.h" /* Note: When encoding, the first matching tag is used, so order is diff --git a/libavformat/riff.h b/libavformat/riff.h index 0548279c6b..85d6786663 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -28,7 +28,6 @@ #ifndef AVFORMAT_RIFF_H #define AVFORMAT_RIFF_H -#include "libavcodec/avcodec.h" #include "avio.h" #include "internal.h" #include "metadata.h" diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 533bb5a15d..444b9fc00d 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -19,12 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avassert.h" #include "libavutil/dict.h" #include "libavutil/error.h" +#include "libavutil/intreadwrite.h" #include "libavutil/log.h" -#include "libavutil/mathematics.h" -#include "libavcodec/avcodec.h" -#include "libavcodec/bytestream.h" #include "avformat.h" #include "avio_internal.h" #include "riff.h" diff --git a/libavformat/rtp.h b/libavformat/rtp.h index 54512c6f71..389b824223 100644 --- a/libavformat/rtp.h +++ b/libavformat/rtp.h @@ -21,9 +21,11 @@ #ifndef AVFORMAT_RTP_H #define AVFORMAT_RTP_H +#include <stdint.h> +#include "libavutil/avutil.h" +#include "libavcodec/codec_id.h" +#include "libavcodec/codec_par.h" #include "libavformat/avformat.h" -#include "libavcodec/avcodec.h" -#include "libavutil/mathematics.h" /** * Return the payload type for a given stream used in the given format context. diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index 701ce072b6..d54a05869f 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -23,7 +23,8 @@ #ifndef AVFORMAT_RTPDEC_H #define AVFORMAT_RTPDEC_H -#include "libavcodec/avcodec.h" +#include "libavcodec/codec_id.h" +#include "libavcodec/packet.h" #include "avformat.h" #include "rtp.h" #include "url.h" diff --git a/libavformat/rtpdec_qdm2.c b/libavformat/rtpdec_qdm2.c index 1eec2da5b4..dce3c48bcc 100644 --- a/libavformat/rtpdec_qdm2.c +++ b/libavformat/rtpdec_qdm2.c @@ -28,7 +28,6 @@ #include <string.h> #include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" -#include "libavcodec/avcodec.h" #include "internal.h" #include "rtp.h" #include "rtpdec.h" diff --git a/libavformat/vpcc.c b/libavformat/vpcc.c index e0b7f288a6..8b4f913b5d 100644 --- a/libavformat/vpcc.c +++ b/libavformat/vpcc.c @@ -21,6 +21,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/pixfmt.h" +#include "libavcodec/avcodec.h" #include "vpcc.h" enum VPX_CHROMA_SUBSAMPLING diff --git a/libavformat/vpcc.h b/libavformat/vpcc.h index e87bec55c2..f05b2f58b3 100644 --- a/libavformat/vpcc.h +++ b/libavformat/vpcc.h @@ -27,10 +27,10 @@ #ifndef AVFORMAT_VPCC_H #define AVFORMAT_VPCC_H -#include <stdint.h> +#include "libavutil/rational.h" +#include "libavcodec/codec_par.h" #include "avio.h" #include "avformat.h" -#include "libavcodec/avcodec.h" typedef struct VPCC { int profile; |