瀏覽代碼

configure: add #include "version.h" to config.h

Avoid clash with version.h of the libraries.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu 12 年之前
父節點
當前提交
ca21116b3f
共有 3 個文件被更改,包括 1 次插入2 次删除
  1. 0 1
      cmdutils.c
  2. 1 0
      configure
  3. 0 1
      ffprobe.c

+ 0 - 1
cmdutils.c

@@ -50,7 +50,6 @@
 #include "libavutil/opt.h"
 #include "libavutil/opt.h"
 #include "libavutil/cpu.h"
 #include "libavutil/cpu.h"
 #include "cmdutils.h"
 #include "cmdutils.h"
-#include "version.h"
 #if CONFIG_NETWORK
 #if CONFIG_NETWORK
 #include "libavformat/network.h"
 #include "libavformat/network.h"
 #endif
 #endif

+ 1 - 0
configure

@@ -4921,6 +4921,7 @@ cat > $TMPH <<EOF
 #define FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
 #define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)"
 #define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)"
 #define FFMPEG_LICENSE "$(c_escape $license)"
 #define FFMPEG_LICENSE "$(c_escape $license)"
+#include "version.h"
 #define CONFIG_THIS_YEAR 2013
 #define CONFIG_THIS_YEAR 2013
 #define FFMPEG_DATADIR "$(eval c_escape $datadir)"
 #define FFMPEG_DATADIR "$(eval c_escape $datadir)"
 #define AVCONV_DATADIR "$(eval c_escape $datadir)"
 #define AVCONV_DATADIR "$(eval c_escape $datadir)"

+ 0 - 1
ffprobe.c

@@ -24,7 +24,6 @@
  */
  */
 
 
 #include "config.h"
 #include "config.h"
-#include "version.h"
 
 
 #include <string.h>
 #include <string.h>