[FFmpeg-cvslog] Do not include pixfmt.h in avutil.h

Mans Rullgard git at videolan.org
Mon Jul 4 00:53:50 CEST 2011


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sat Jun  4 13:12:08 2011 +0100| [d49ea4afb4e39e4af33435452dee8ef4c852d83d] | committer: Mans Rullgard

Do not include pixfmt.h in avutil.h

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d49ea4afb4e39e4af33435452dee8ef4c852d83d
---

 libavcodec/avcodec.h          |    1 +
 libavfilter/avfilter.h        |    1 +
 libavutil/avutil.h            |    1 -
 libswscale/swscale.h          |    1 +
 libswscale/swscale_internal.h |    1 +
 5 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 9502a00..a23c3cb 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 b84539c..d3c977a 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 0cdeef2..782de7d 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 3899596..451f07c 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 e4b93c5..8d03cb6 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
 



More information about the ffmpeg-cvslog mailing list