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

Also include channel_layout.h directly wherever used.

Andreas Rheinhardt committed 5 years ago

Commit 1be3d8a1 parent 57b5ec693 files · +95 −1Browse files

Showing the changes to libavfilter (13 of 93 files). Show all

Unified · Split

13 files

@@ -26,6 +26,7 @@ · 25 unmodified lines
26	26	#include <float.h>
27	27
28	28	#include "libavutil/avstring.h"
	29	+#include "libavutil/channel_layout.h"
29	30	#include "libavutil/common.h"
30	31	#include "libavutil/float_dsp.h"
31	32	#include "libavutil/intreadwrite.h"

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

@@ -63,6 +63,7 @@ · 62 unmodified lines
63	63	*/
64	64
65	65	#include "libavutil/avassert.h"
	66	+#include "libavutil/channel_layout.h"
66	67	#include "libavutil/ffmath.h"
67	68	#include "libavutil/opt.h"
68	69	#include "audio.h"

@@ -18,6 +18,7 @@ · 17 unmodified lines
18	18	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19	19	*/
20	20
	21	+#include "libavutil/channel_layout.h"
21	22	#include "libavutil/opt.h"
22	23	#include "libavutil/eval.h"
23	24	#include "libavutil/avassert.h"

@@ -43,6 +43,7 @@ · 42 unmodified lines
43	43	* HDCD decoding filter
44	44	*/
45	45
	46	+#include "libavutil/channel_layout.h"
46	47	#include "libavutil/opt.h"
47	48	#include "libavutil/avassert.h"
48	49	#include "avfilter.h"

@@ -28,6 +28,7 @@ · 27 unmodified lines
28	28	#include <float.h>
29	29
30	30	#include "libavutil/avassert.h"
	31	+#include "libavutil/channel_layout.h"
31	32	#include "libavutil/opt.h"
32	33
33	34	#define FF_BUFQUEUE_SIZE (1024)

@@ -18,6 +18,7 @@ · 17 unmodified lines
18	18	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19	19	*/
20	20
	21	+#include "libavutil/channel_layout.h"
21	22	#include "libavutil/eval.h"
22	23	#include "libavutil/opt.h"
23	24	#include "libavutil/tx.h"

@@ -18,6 +18,7 @@ · 17 unmodified lines
18	18	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19	19	*/
20	20
	21	+#include "libavutil/channel_layout.h"
21	22	#include "libavutil/opt.h"
22	23	#include "audio.h"
23	24	#include "avfilter.h"

@@ -18,6 +18,7 @@ · 17 unmodified lines
18	18	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19	19	*/
20	20
	21	+#include "libavutil/channel_layout.h"
21	22	#include "libavutil/opt.h"
22	23	#include "audio.h"
23	24	#include "avfilter.h"

@@ -20,6 +20,7 @@ · 19 unmodified lines
20	20	*/
21	21
22	22	#include "libavutil/avassert.h"
	23	+#include "libavutil/channel_layout.h"
23	24	#include "libavutil/opt.h"
24	25
25	26	#include "libavcodec/avfft.h"

@@ -21,6 +21,7 @@ · 20 unmodified lines
21	21	#include "config.h"
22	22	#include "libavcodec/avfft.h"
23	23	#include "libavutil/avassert.h"
	24	+#include "libavutil/channel_layout.h"
24	25	#include "libavutil/opt.h"
25	26	#include "libavutil/xga_font_data.h"
26	27	#include "libavutil/eval.h"

@@ -33,6 +33,7 @@ · 32 unmodified lines
33	33	#include "libavutil/attributes.h"
34	34	#include "libavutil/avstring.h"
35	35	#include "libavutil/avassert.h"
	36	+#include "libavutil/channel_layout.h"
36	37	#include "libavutil/opt.h"
37	38	#include "libavutil/imgutils.h"
38	39	#include "libavutil/internal.h"

@@ -18,6 +18,7 @@ · 17 unmodified lines
18	18	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19	19	*/
20	20
	21	+#include "libavutil/channel_layout.h"
21	22	#include "libavfilter/formats.c"
22	23
23	24	#undef printf

Keyboard shortcuts