[FFmpeg-cvslog] Do not include log.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:34:27 2011 +0100| [abc78a5a7c158e9813db502cedce096101e38890] | committer: Mans Rullgard
Do not include log.h in avutil.h
Signed-off-by: Mans Rullgard <mans at mansr.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=abc78a5a7c158e9813db502cedce096101e38890
---
libavcodec/avcodec.h | 1 +
libavfilter/avfilter.h | 1 +
libavformat/avformat.h | 1 +
libavutil/avutil.h | 1 -
libavutil/eval.c | 1 +
libavutil/file.c | 1 +
libavutil/imgutils.c | 1 +
libavutil/opt.c | 1 +
libavutil/parseutils.c | 1 +
libpostproc/postprocess_internal.h | 1 +
libswscale/swscale.h | 1 +
libswscale/swscale_internal.h | 1 +
12 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index a23c3cb..b26bac7 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/log.h"
#include "libavutil/pixfmt.h"
#include "libavutil/rational.h"
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index d3c977a..f8295e7 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -23,6 +23,7 @@
#define AVFILTER_AVFILTER_H
#include "libavutil/avutil.h"
+#include "libavutil/log.h"
#include "libavutil/samplefmt.h"
#include "libavutil/pixfmt.h"
#include "libavutil/rational.h"
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 8561a50..12490c1 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -41,6 +41,7 @@ const char *avformat_license(void);
#include <stdio.h> /* FILE */
#include "libavcodec/avcodec.h"
#include "libavutil/dict.h"
+#include "libavutil/log.h"
#include "avio.h"
#include "libavformat/version.h"
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 782de7d..01e4e2f 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -121,6 +121,5 @@ char av_get_picture_type_char(enum AVPictureType pict_type);
#include "common.h"
#include "error.h"
-#include "log.h"
#endif /* AVUTIL_AVUTIL_H */
diff --git a/libavutil/eval.c b/libavutil/eval.c
index a378821..4bba343 100644
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -28,6 +28,7 @@
#include "avutil.h"
#include "eval.h"
+#include "log.h"
typedef struct Parser {
const AVClass *class;
diff --git a/libavutil/file.c b/libavutil/file.c
index f0e48b5..649bb76 100644
--- a/libavutil/file.c
+++ b/libavutil/file.c
@@ -17,6 +17,7 @@
*/
#include "file.h"
+#include "log.h"
#include <fcntl.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c
index 46853ca..5cd71e2 100644
--- a/libavutil/imgutils.c
+++ b/libavutil/imgutils.c
@@ -23,6 +23,7 @@
#include "imgutils.h"
#include "internal.h"
+#include "log.h"
#include "pixdesc.h"
void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
diff --git a/libavutil/opt.c b/libavutil/opt.c
index acb745c..65e0213 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -30,6 +30,7 @@
#include "opt.h"
#include "eval.h"
#include "dict.h"
+#include "log.h"
#if FF_API_FIND_OPT
//FIXME order them and do a bin search
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
index c8124c5..9bac7ab 100644
--- a/libavutil/parseutils.c
+++ b/libavutil/parseutils.c
@@ -28,6 +28,7 @@
#include "avstring.h"
#include "avutil.h"
#include "eval.h"
+#include "log.h"
#include "random_seed.h"
#include "parseutils.h"
diff --git a/libpostproc/postprocess_internal.h b/libpostproc/postprocess_internal.h
index 010e629..331a96b 100644
--- a/libpostproc/postprocess_internal.h
+++ b/libpostproc/postprocess_internal.h
@@ -28,6 +28,7 @@
#include <string.h>
#include "libavutil/avutil.h"
+#include "libavutil/log.h"
#include "postprocess.h"
#define V_DEBLOCK 0x01
diff --git a/libswscale/swscale.h b/libswscale/swscale.h
index 451f07c..80e5eaa 100644
--- a/libswscale/swscale.h
+++ b/libswscale/swscale.h
@@ -28,6 +28,7 @@
*/
#include "libavutil/avutil.h"
+#include "libavutil/log.h"
#include "libavutil/pixfmt.h"
#define LIBSWSCALE_VERSION_MAJOR 2
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 8d03cb6..340227d 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -28,6 +28,7 @@
#endif
#include "libavutil/avutil.h"
+#include "libavutil/log.h"
#include "libavutil/pixfmt.h"
#define STR(s) AV_TOSTRING(s) //AV_STRINGIFY is too long
More information about the ffmpeg-cvslog
mailing list