diff options
| author | wm4 <wm4@nowhere> | 2013-12-18 17:12:21 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-18 17:12:21 +0100 |
| commit | 2c08bf1bd744bb8eb5986f1ccb3ae03e284170dc (patch) | |
| tree | d8d7c08760dcc584f99eff7b921bb87a116fe532 /video | |
| parent | 5e0424f17f23c24e82a4325ff81e7ef67ac1337a (diff) | |
| download | mpv-2c08bf1bd744bb8eb5986f1ccb3ae03e284170dc.tar.bz2 mpv-2c08bf1bd744bb8eb5986f1ccb3ae03e284170dc.tar.xz | |
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.
Diffstat (limited to 'video')
| -rw-r--r-- | video/decode/lavc.h | 2 | ||||
| -rw-r--r-- | video/fmt-conversion.c | 6 | ||||
| -rw-r--r-- | video/mp_image.h | 1 | ||||
| -rw-r--r-- | video/out/x11_common.h | 2 | ||||
| -rw-r--r-- | video/sws_utils.c | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/video/decode/lavc.h b/video/decode/lavc.h index c623700089..ead147ab18 100644 --- a/video/decode/lavc.h +++ b/video/decode/lavc.h @@ -5,8 +5,6 @@ #include <libavcodec/avcodec.h> -#include "config.h" - #include "demux/stheader.h" #include "video/mp_image.h" #include "video/hwdec.h" diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 2dbbd026bc..e79ce4d29d 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -16,9 +16,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "common/msg.h" -#include "libavutil/avutil.h" #include <libavutil/pixdesc.h> +#include <libavutil/avutil.h> + +#include "config.h" +#include "common/msg.h" #include "video/img_format.h" #include "fmt-conversion.h" diff --git a/video/mp_image.h b/video/mp_image.h index dfb83b3bb1..c882a59caa 100644 --- a/video/mp_image.h +++ b/video/mp_image.h @@ -24,6 +24,7 @@ #include <stdlib.h> #include <string.h> #include <inttypes.h> +#include "common/common.h" #include "common/msg.h" #include "csputils.h" #include "video/img_format.h" diff --git a/video/out/x11_common.h b/video/out/x11_common.h index 0b22681731..dedf85c257 100644 --- a/video/out/x11_common.h +++ b/video/out/x11_common.h @@ -24,8 +24,6 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#include "config.h" - struct vo; struct mp_rect; diff --git a/video/sws_utils.c b/video/sws_utils.c index 5455c7d51b..28ec10cb6a 100644 --- a/video/sws_utils.c +++ b/video/sws_utils.c @@ -22,6 +22,8 @@ #include <libavcodec/avcodec.h> #include <libavutil/opt.h> +#include "config.h" + #include "sws_utils.h" #include "common/common.h" |