From d49ea4afb4e39e4af33435452dee8ef4c852d83d Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sat, 4 Jun 2011 13:12:08 +0100 Subject: [PATCH] Do not include pixfmt.h in avutil.h Signed-off-by: Mans Rullgard --- 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 deletion(-) 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