[FFmpeg-cvslog] Clean up #includes in cmdutils.h.

Diego Biurrun git at videolan.org
Thu May 19 13:11:00 CEST 2011


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sun May 15 17:09:25 2011 +0200| [ea91e77127229015d23a046f1797d3fc6a33e54d] | committer: Diego Biurrun

Clean up #includes in cmdutils.h.

inttypes.h is not necessary, just stdint.h is enough.
Unconditionally #include avfilter.h in cmdutils.h.  It is an installed
header with no non-standard external dependencies, so it is safe.

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

 cmdutils.h |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/cmdutils.h b/cmdutils.h
index bb8d779..c99c865 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -22,8 +22,10 @@
 #ifndef FFMPEG_CMDUTILS_H
 #define FFMPEG_CMDUTILS_H
 
-#include <inttypes.h>
+#include <stdint.h>
+
 #include "libavcodec/avcodec.h"
+#include "libavfilter/avfilter.h"
 #include "libavformat/avformat.h"
 #include "libswscale/swscale.h"
 
@@ -278,9 +280,6 @@ int64_t guess_correct_pts(PtsCorrectionContext *ctx, int64_t pts, int64_t dts);
 FILE *get_preset_file(char *filename, size_t filename_size,
                       const char *preset_name, int is_path, const char *codec_name);
 
-#if CONFIG_AVFILTER
-#include "libavfilter/avfilter.h"
-
 typedef struct {
     enum PixelFormat pix_fmt;
 } FFSinkContext;
@@ -296,6 +295,4 @@ extern AVFilter ffsink;
 int get_filtered_video_frame(AVFilterContext *sink, AVFrame *frame,
                              AVFilterBufferRef **picref, AVRational *pts_tb);
 
-#endif /* CONFIG_AVFILTER */
-
 #endif /* FFMPEG_CMDUTILS_H */



More information about the ffmpeg-cvslog mailing list