Do not include pixfmt.h in avutil.h

Mans Rullgard committed 15 years ago

Commit d49ea4a1 parent e91709c5 files · +4 −1Browse files

Unified · Split

5 files

libavcodec/avcodec.h +1 −0
libavfilter/avfilter.h +1 −0
libavutil/avutil.h +0 −1
libswscale/swscale.h +1 −0
libswscale/swscale_internal.h +1 −0

libavcodec/avcodec.h+1−0

@@ -30,6 +30,7 @@ · 29 unmodified lines
30	30	#include "libavutil/samplefmt.h"
31	31	#include "libavutil/avutil.h"
32	32	#include "libavutil/cpu.h"
	33	+#include "libavutil/pixfmt.h"
33	34	#include "libavutil/rational.h"
34	35
35	36	#include "libavcodec/version.h"

libavfilter/avfilter.h+1−0

@@ -24,6 +24,7 @@ · 23 unmodified lines
24	24
25	25	#include "libavutil/avutil.h"
26	26	#include "libavutil/samplefmt.h"
	27	+#include "libavutil/pixfmt.h"
27	28	#include "libavutil/rational.h"
28	29
29	30	#define LIBAVFILTER_VERSION_MAJOR 2

libavutil/avutil.h+0−1

@@ -122,6 +122,5 @@ char av_get_picture_type_char(enum AVPictureType pict_type); · 121 unmodified lines
122	122	#include "common.h"
123	123	#include "error.h"
124	124	#include "log.h"
125		−#include "pixfmt.h"
126	125
127	126	#endif /* AVUTIL_AVUTIL_H */

libswscale/swscale.h+1−0

@@ -28,6 +28,7 @@ · 27 unmodified lines
28	28	*/
29	29
30	30	#include "libavutil/avutil.h"
	31	+#include "libavutil/pixfmt.h"
31	32
32	33	#define LIBSWSCALE_VERSION_MAJOR 2
33	34	#define LIBSWSCALE_VERSION_MINOR 0

libswscale/swscale_internal.h+1−0

@@ -28,6 +28,7 @@ · 27 unmodified lines
28	28	#endif
29	29
30	30	#include "libavutil/avutil.h"
	31	+#include "libavutil/pixfmt.h"
31	32
32	33	#define STR(s) AV_TOSTRING(s) //AV_STRINGIFY is too long
33	34