From 2c08bf1bd744bb8eb5986f1ccb3ae03e284170dc Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 18 Dec 2013 17:12:21 +0100
Subject: Reduce recursive config.h inclusions in headers

In my opinion, config.h inclusions should be kept to a minimum. MPlayer
code really liked including config.h everywhere, though, even in often
used header files. Try to reduce this.
---
 audio/filter/af.c            | 2 ++
 audio/filter/af.h            | 2 --
 audio/filter/af_lavcac3enc.c | 2 +-
 audio/format.h               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'audio')

diff --git a/audio/filter/af.c b/audio/filter/af.c
index dfe1666e0a..417dede971 100644
--- a/audio/filter/af.c
+++ b/audio/filter/af.c
@@ -22,6 +22,8 @@
 #include <string.h>
 #include <assert.h>
 
+#include "common/common.h"
+
 #include "options/m_option.h"
 #include "options/m_config.h"
 
diff --git a/audio/filter/af.h b/audio/filter/af.h
index 1e78c01718..d08560bece 100644
--- a/audio/filter/af.h
+++ b/audio/filter/af.h
@@ -23,8 +23,6 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "config.h"
-
 #include "options/options.h"
 #include "audio/format.h"
 #include "audio/chmap.h"
diff --git a/audio/filter/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c
index 4331122299..f0a174b475 100644
--- a/audio/filter/af_lavcac3enc.c
+++ b/audio/filter/af_lavcac3enc.c
@@ -32,7 +32,7 @@
 #include <libavutil/common.h>
 #include <libavutil/mem.h>
 
-#include "config.h"
+#include "common/common.h"
 #include "af.h"
 #include "audio/audio_buffer.h"
 #include "audio/fmt-conversion.h"
diff --git a/audio/format.h b/audio/format.h
index d21707e677..19118a7b59 100644
--- a/audio/format.h
+++ b/audio/format.h
@@ -25,7 +25,7 @@
 
 #include <stdbool.h>
 #include <sys/types.h>
-#include "config.h"
+
 #include "bstr/bstr.h"
 
 #if BYTE_ORDER == BIG_ENDIAN
-- 
cgit v1.2.3