avcodec/avcodec: Stop including bsf.h in avcodec.h

Also include bsf.h directly wherever it is used. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
FFmpeg · Jul 22, 2021 · 57b5ec6 · 57b5ec6
1 parent 73b847e
commit 57b5ec6
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 4 deletions.
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
@@ -53,6 +53,7 @@
 #include "libavutil/cpu.h"
 #include "libavutil/ffversion.h"
 #include "libavutil/version.h"
+#include "libavcodec/bsf.h"
 #include "cmdutils.h"
 #if HAVE_SYS_RESOURCE_H
 #include <sys/time.h>

diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
@@ -31,6 +31,7 @@
 #include "libavformat/avio.h"
 
 #include "libavcodec/avcodec.h"
+#include "libavcodec/bsf.h"
 
 #include "libavfilter/avfilter.h"
 

diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
@@ -27,6 +27,7 @@
 #include "libavformat/avformat.h"
 
 #include "libavcodec/avcodec.h"
+#include "libavcodec/bsf.h"
 
 #include "libavfilter/avfilter.h"
 

diff --git 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
@@ -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
@@ -16,12 +16,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "config.h"
+#include <stdint.h>
+#include <string.h>
 
-#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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -19,6 +19,7 @@
  */
 
 #include "avcodec.h"
+#include "bsf.h"
 #include "bsf_internal.h"
 #include "libavutil/avassert.h"
 #include "libavutil/opt.h"

diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c
@@ -25,6 +25,7 @@
 #include "libavutil/fifo.h"
 #include "libavutil/opt.h"
 #include "libavcodec/av1_parse.h"
+#include "libavcodec/bsf.h"
 #include "avformat.h"
 #include "avio_internal.h"
 #include "internal.h"

diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
@@ -25,6 +25,7 @@
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/timestamp.h"
+#include "libavcodec/bsf.h"
 #include "avformat.h"
 #include "internal.h"
 #include "url.h"

diff --git a/libavformat/internal.h b/libavformat/internal.h
@@ -26,6 +26,7 @@
 #include "libavutil/bprint.h"
 
 #include "libavcodec/avcodec.h"
+#include "libavcodec/bsf.h"
 
 #include "avformat.h"
 #include "os_support.h"

diff --git a/libavformat/mux.c b/libavformat/mux.c
@@ -21,6 +21,7 @@
 
 #include "avformat.h"
 #include "internal.h"
+#include "libavcodec/bsf.h"
 #include "libavcodec/internal.h"
 #include "libavcodec/packet_internal.h"
 #include "libavutil/opt.h"

diff --git a/libavformat/tee.c b/libavformat/tee.c
@@ -23,6 +23,7 @@
 #include "libavutil/avutil.h"
 #include "libavutil/avstring.h"
 #include "libavutil/opt.h"
+#include "libavcodec/bsf.h"
 #include "internal.h"
 #include "avformat.h"
 #include "avio_internal.h"

diff --git a/libavformat/utils.c b/libavformat/utils.c
@@ -35,6 +35,7 @@
 #include "libavutil/time.h"
 #include "libavutil/timestamp.h"
 
+#include "libavcodec/bsf.h"
 #include "libavcodec/bytestream.h"
 #include "libavcodec/internal.h"
 #include "libavcodec/packet_internal.h"

diff --git a/tools/target_bsf_fuzzer.c b/tools/target_bsf_fuzzer.c
@@ -21,6 +21,7 @@
 #include "libavutil/opt.h"
 
 #include "libavcodec/avcodec.h"
+#include "libavcodec/bsf.h"
 #include "libavcodec/bsf_internal.h"
 #include "libavcodec/bytestream.h"
 #include "libavcodec/internal.h"