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

Also include bsf.h directly wherever it is used.

Andreas Rheinhardt committed 5 years ago

Commit 57b5ec61 parent 73b847e20 files · +21 −4Browse files

Unified · Split

20 files

fftools/cmdutils.c +1 −0
fftools/ffmpeg.h +1 −0
fftools/ffmpeg_opt.c +1 −0
libavcodec/avcodec.c +1 −0
libavcodec/avcodec.h +0 −1
libavcodec/bitstream_filters.c +3 −3
libavcodec/cbs_bsf.c +1 −0
libavcodec/decode.c +1 −0
libavcodec/internal.h +1 −0
libavcodec/libaomenc.c +1 −0
libavcodec/librav1e.c +1 −0
libavcodec/opus_metadata_bsf.c +1 −0
libavcodec/pcm_rechunk_bsf.c +1 −0
libavformat/av1dec.c +1 −0
libavformat/concatdec.c +1 −0
libavformat/internal.h +1 −0
libavformat/mux.c +1 −0
libavformat/tee.c +1 −0
libavformat/utils.c +1 −0
tools/target_bsf_fuzzer.c +1 −0

@@ -53,6 +53,7 @@ · 52 unmodified lines
53	53	#include "libavutil/cpu.h"
54	54	#include "libavutil/ffversion.h"
55	55	#include "libavutil/version.h"
	56	+#include "libavcodec/bsf.h"
56	57	#include "cmdutils.h"
57	58	#if HAVE_SYS_RESOURCE_H
58	59	#include <sys/time.h>

fftools/ffmpeg.h+1−0

@@ -31,6 +31,7 @@ · 30 unmodified lines
31	31	#include "libavformat/avio.h"
32	32
33	33	#include "libavcodec/avcodec.h"
	34	+#include "libavcodec/bsf.h"
34	35
35	36	#include "libavfilter/avfilter.h"
36	37

fftools/ffmpeg_opt.c+1−0

@@ -27,6 +27,7 @@ · 26 unmodified lines
27	27	#include "libavformat/avformat.h"
28	28
29	29	#include "libavcodec/avcodec.h"
	30	+#include "libavcodec/bsf.h"
30	31
31	32	#include "libavfilter/avfilter.h"
32	33

libavcodec/avcodec.c+1−0

@@ -32,6 +32,7 @@ · 31 unmodified lines
32	32	#include "libavutil/opt.h"
33	33	#include "libavutil/thread.h"
34	34	#include "avcodec.h"
	35	+#include "bsf.h"
35	36	#include "decode.h"
36	37	#include "encode.h"
37	38	#include "frame_thread_encoder.h"

libavcodec/avcodec.h+0−1

@@ -41,7 +41,6 @@ · 40 unmodified lines
41	41	#include "libavutil/pixfmt.h"
42	42	#include "libavutil/rational.h"
43	43
44		−#include "bsf.h"
45	44	#include "codec.h"
46	45	#include "codec_desc.h"
47	46	#include "codec_par.h"

libavcodec/bitstream_filters.c+3−3

@@ -16,12 +16,12 @@ · 15 unmodified lines
16	16	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17	17	*/
18	18
19		−#include "config.h"
	19	+#include <stdint.h>
	20	+#include <string.h>
20	21
21		−#include "libavutil/common.h"
22	22	#include "libavutil/log.h"
23	23
24		−#include "avcodec.h"
	24	+#include "bsf.h"
25	25	#include "bsf_internal.h"
26	26
27	27	extern const AVBitStreamFilter ff_aac_adtstoasc_bsf;

libavcodec/cbs_bsf.c+1−0

@@ -16,6 +16,7 @@ · 15 unmodified lines
16	16	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17	17	*/
18	18
	19	+#include "bsf.h"
19	20	#include "bsf_internal.h"
20	21	#include "cbs_bsf.h"
21	22

libavcodec/decode.c+1−0

@@ -40,6 +40,7 @@ · 39 unmodified lines
40	40
41	41	#include "avcodec.h"
42	42	#include "bytestream.h"
	43	+#include "bsf.h"
43	44	#include "decode.h"
44	45	#include "hwconfig.h"
45	46	#include "internal.h"

libavcodec/internal.h+1−0

@@ -32,6 +32,7 @@ · 31 unmodified lines
32	32	#include "libavutil/mathematics.h"
33	33	#include "libavutil/pixfmt.h"
34	34	#include "avcodec.h"
	35	+#include "bsf.h"
35	36	#include "config.h"
36	37
37	38	/**

libavcodec/libaomenc.c+1−0

@@ -36,6 +36,7 @@ · 35 unmodified lines
36	36
37	37	#include "av1.h"
38	38	#include "avcodec.h"
	39	+#include "bsf.h"
39	40	#include "encode.h"
40	41	#include "internal.h"
41	42	#include "packet_internal.h"

libavcodec/librav1e.c+1−0

@@ -30,6 +30,7 @@ · 29 unmodified lines
30	30	#include "libavutil/opt.h"
31	31	#include "libavutil/pixdesc.h"
32	32	#include "avcodec.h"
	33	+#include "bsf.h"
33	34	#include "encode.h"
34	35	#include "internal.h"
35	36

libavcodec/opus_metadata_bsf.c+1−0

@@ -16,6 +16,7 @@ · 15 unmodified lines
16	16	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17	17	*/
18	18
	19	+#include "bsf.h"
19	20	#include "bsf_internal.h"
20	21	#include "libavutil/intreadwrite.h"
21	22	#include "libavutil/opt.h"

libavcodec/pcm_rechunk_bsf.c+1−0

@@ -19,6 +19,7 @@ · 18 unmodified lines
19	19	*/
20	20
21	21	#include "avcodec.h"
	22	+#include "bsf.h"
22	23	#include "bsf_internal.h"
23	24	#include "libavutil/avassert.h"
24	25	#include "libavutil/opt.h"

libavformat/av1dec.c+1−0

@@ -25,6 +25,7 @@ · 24 unmodified lines
25	25	#include "libavutil/fifo.h"
26	26	#include "libavutil/opt.h"
27	27	#include "libavcodec/av1_parse.h"
	28	+#include "libavcodec/bsf.h"
28	29	#include "avformat.h"
29	30	#include "avio_internal.h"
30	31	#include "internal.h"

libavformat/concatdec.c+1−0

@@ -25,6 +25,7 @@ · 24 unmodified lines
25	25	#include "libavutil/opt.h"
26	26	#include "libavutil/parseutils.h"
27	27	#include "libavutil/timestamp.h"
	28	+#include "libavcodec/bsf.h"
28	29	#include "avformat.h"
29	30	#include "internal.h"
30	31	#include "url.h"

libavformat/internal.h+1−0

@@ -26,6 +26,7 @@ · 25 unmodified lines
26	26	#include "libavutil/bprint.h"
27	27
28	28	#include "libavcodec/avcodec.h"
	29	+#include "libavcodec/bsf.h"
29	30
30	31	#include "avformat.h"
31	32	#include "os_support.h"

libavformat/mux.c+1−0

@@ -21,6 +21,7 @@ · 20 unmodified lines
21	21
22	22	#include "avformat.h"
23	23	#include "internal.h"
	24	+#include "libavcodec/bsf.h"
24	25	#include "libavcodec/internal.h"
25	26	#include "libavcodec/packet_internal.h"
26	27	#include "libavutil/opt.h"

libavformat/tee.c+1−0

@@ -23,6 +23,7 @@ · 22 unmodified lines
23	23	#include "libavutil/avutil.h"
24	24	#include "libavutil/avstring.h"
25	25	#include "libavutil/opt.h"
	26	+#include "libavcodec/bsf.h"
26	27	#include "internal.h"
27	28	#include "avformat.h"
28	29	#include "avio_internal.h"

libavformat/utils.c+1−0

@@ -35,6 +35,7 @@ · 34 unmodified lines
35	35	#include "libavutil/time.h"
36	36	#include "libavutil/timestamp.h"
37	37
	38	+#include "libavcodec/bsf.h"
38	39	#include "libavcodec/bytestream.h"
39	40	#include "libavcodec/internal.h"
40	41	#include "libavcodec/packet_internal.h"

tools/target_bsf_fuzzer.c+1−0

@@ -21,6 +21,7 @@ · 20 unmodified lines
21	21	#include "libavutil/opt.h"
22	22
23	23	#include "libavcodec/avcodec.h"
	24	+#include "libavcodec/bsf.h"
24	25	#include "libavcodec/bsf_internal.h"
25	26	#include "libavcodec/bytestream.h"
26	27	#include "libavcodec/internal.h"

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code