From 57b5ec6ba7df442caebc401c4a7ef3ebc066b519 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 11 Jun 2021 23:35:33 +0200 Subject: avcodec/avcodec: Stop including bsf.h in avcodec.h Also include bsf.h directly wherever it is used. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 1 + libavcodec/avcodec.h | 1 - libavcodec/bitstream_filters.c | 6 +++--- libavcodec/cbs_bsf.c | 1 + libavcodec/decode.c | 1 + libavcodec/internal.h | 1 + libavcodec/libaomenc.c | 1 + libavcodec/librav1e.c | 1 + libavcodec/opus_metadata_bsf.c | 1 + libavcodec/pcm_rechunk_bsf.c | 1 + 10 files changed, 11 insertions(+), 4 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index d369b30bbc..3b3a3ef05a 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -32,6 +32,7 @@ #include "libavutil/opt.h" #include "libavutil/thread.h" #include "avcodec.h" +#include "bsf.h" #include "decode.h" #include "encode.h" #include "frame_thread_encoder.h" diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8b97895aeb..f9d8edc3e2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -41,7 +41,6 @@ #include "libavutil/pixfmt.h" #include "libavutil/rational.h" -#include "bsf.h" #include "codec.h" #include "codec_desc.h" #include "codec_par.h" diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index e03326515b..d565286397 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" +#include +#include -#include "libavutil/common.h" #include "libavutil/log.h" -#include "avcodec.h" +#include "bsf.h" #include "bsf_internal.h" extern const AVBitStreamFilter ff_aac_adtstoasc_bsf; diff --git a/libavcodec/cbs_bsf.c b/libavcodec/cbs_bsf.c index 0977d431f7..86ec3f2a4d 100644 --- a/libavcodec/cbs_bsf.c +++ b/libavcodec/cbs_bsf.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "bsf.h" #include "bsf_internal.h" #include "cbs_bsf.h" diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 568710cf4a..7c367cdf70 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -40,6 +40,7 @@ #include "avcodec.h" #include "bytestream.h" +#include "bsf.h" #include "decode.h" #include "hwconfig.h" #include "internal.h" diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 586819cd1b..1921515bdd 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -32,6 +32,7 @@ #include "libavutil/mathematics.h" #include "libavutil/pixfmt.h" #include "avcodec.h" +#include "bsf.h" #include "config.h" /** diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index f977fb4889..742c96589c 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -36,6 +36,7 @@ #include "av1.h" #include "avcodec.h" +#include "bsf.h" #include "encode.h" #include "internal.h" #include "packet_internal.h" diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c index 619a4d0b36..a368ee508f 100644 --- a/libavcodec/librav1e.c +++ b/libavcodec/librav1e.c @@ -30,6 +30,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avcodec.h" +#include "bsf.h" #include "encode.h" #include "internal.h" diff --git a/libavcodec/opus_metadata_bsf.c b/libavcodec/opus_metadata_bsf.c index 723e31c243..e73852d618 100644 --- a/libavcodec/opus_metadata_bsf.c +++ b/libavcodec/opus_metadata_bsf.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "bsf.h" #include "bsf_internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" diff --git a/libavcodec/pcm_rechunk_bsf.c b/libavcodec/pcm_rechunk_bsf.c index 47f44b6467..32a90cd2f7 100644 --- a/libavcodec/pcm_rechunk_bsf.c +++ b/libavcodec/pcm_rechunk_bsf.c @@ -19,6 +19,7 @@ */ #include "avcodec.h" +#include "bsf.h" #include "bsf_internal.h" #include "libavutil/avassert.h" #include "libavutil/opt.h" -- cgit v1.2.3