aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-06-04 13:12:08 +0100
committerMans Rullgard <mans@mansr.com>2011-07-03 21:42:07 +0100
commitd49ea4afb4e39e4af33435452dee8ef4c852d83d (patch)
treedc53946ace61cc510df4762f5e45f908e28a7222
parente91709ca178800faf7f6ce228eb260a6efaa2451 (diff)
downloadffmpeg-d49ea4afb4e39e4af33435452dee8ef4c852d83d.tar.gz
Do not include pixfmt.h in avutil.h
Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r--libavcodec/avcodec.h1
-rw-r--r--libavfilter/avfilter.h1
-rw-r--r--libavutil/avutil.h1
-rw-r--r--libswscale/swscale.h1
-rw-r--r--libswscale/swscale_internal.h1
5 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 9502a0018b..a23c3cbf05 100644
--- 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 b84539c942..d3c977a7e2 100644
--- 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 0cdeef2157..782de7d2aa 100644
--- 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 3899596983..451f07c72a 100644
--- 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 e4b93c595b..8d03cb629d 100644
--- 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