Do not include pixfmt.h in avutil.h

Signed-off-by: Mans Rullgard <mans@mansr.com>

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 9502a0018bb0e9cecf2d6ed71c293b7039c18c36..a23c3cbf0516c366c3501c1cc8d7f5ff26a68d3d 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -30,6 +30,7 @@
 #include "libavutil/samplefmt.h"
 #include "libavutil/avutil.h"
 #include "libavutil/cpu.h"
+#include "libavutil/pixfmt.h"
 #include "libavutil/rational.h"
 
 #include "libavcodec/version.h"

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index b84539c9422385078e0b920f8644940df0a73cc9..d3c977a7e28dc9e7b2b514e41013db7067bf7243 100644 (file)
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -24,6 +24,7 @@
 
 #include "libavutil/avutil.h"
 #include "libavutil/samplefmt.h"
+#include "libavutil/pixfmt.h"
 #include "libavutil/rational.h"
 
 #define LIBAVFILTER_VERSION_MAJOR  2

diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 0cdeef2157be907b4594f3f7117974fd29ed331a..782de7d2aae0a8fa7bd31d33efd5641ca9530bc5 100644 (file)
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -122,6 +122,5 @@ char av_get_picture_type_char(enum AVPictureType pict_type);
 #include "common.h"
 #include "error.h"
 #include "log.h"
-#include "pixfmt.h"
 
 #endif /* AVUTIL_AVUTIL_H */

diff --git a/libswscale/swscale.h b/libswscale/swscale.h
index 38995969834395025b1de055a0a5794952529309..451f07c72aadcf969e2a558eedc3fb71d66bc57f 100644 (file)
--- a/libswscale/swscale.h
+++ b/libswscale/swscale.h
@@ -28,6 +28,7 @@
  */
 
 #include "libavutil/avutil.h"
+#include "libavutil/pixfmt.h"
 
 #define LIBSWSCALE_VERSION_MAJOR 2
 #define LIBSWSCALE_VERSION_MINOR 0

diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index e4b93c595b7da5e33654fa289c2db4771f37ef43..8d03cb629d3d50d799452a54958af81a6de5e2ae 100644 (file)
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -28,6 +28,7 @@
 #endif
 
 #include "libavutil/avutil.h"
+#include "libavutil/pixfmt.h"
 
 #define STR(s)         AV_TOSTRING(s) //AV_STRINGIFY is too long