configure: add #include "version.h" to config.h
authorTimothy Gu <timothygu99@gmail.com>
Tue, 26 Nov 2013 22:43:18 +0000 (14:43 -0800)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 22:06:13 +0000 (23:06 +0100)
Avoid clash with version.h of the libraries.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.c
configure
ffprobe.c

index 2608bce..95accb0 100644 (file)
@@ -50,7 +50,6 @@
 #include "libavutil/opt.h"
 #include "libavutil/cpu.h"
 #include "cmdutils.h"
-#include "version.h"
 #if CONFIG_NETWORK
 #include "libavformat/network.h"
 #endif
index 99fac77..1f9ed15 100755 (executable)
--- a/configure
+++ b/configure
@@ -4921,6 +4921,7 @@ cat > $TMPH <<EOF
 #define FFMPEG_CONFIG_H
 #define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)"
 #define FFMPEG_LICENSE "$(c_escape $license)"
+#include "version.h"
 #define CONFIG_THIS_YEAR 2013
 #define FFMPEG_DATADIR "$(eval c_escape $datadir)"
 #define AVCONV_DATADIR "$(eval c_escape $datadir)"
index d124d4e..c68cb16 100644 (file)
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -24,7 +24,6 @@
  */
 
 #include "config.h"
-#include "version.h"
 
 #include <string.h>