Revert "configure: add #include "version.h" to config.h"
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 23:19:45 +0000 (00:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 23:19:45 +0000 (00:19 +0100)
This reverts commit ca21116b3f53a9bdd74364bfab9cde70a044b165.

Revert suggested by Jamal:
"Bad secondary effect i just noticed: Every time version.h is changed
 (git pull for example), anything that includes config.h will be
 recompiled. And that means pretty much every single file in the tree.
"

cmdutils.c
configure
ffprobe.c

index 95accb0..2608bce 100644 (file)
@@ -50,6 +50,7 @@
 #include "libavutil/opt.h"
 #include "libavutil/cpu.h"
 #include "cmdutils.h"
+#include "version.h"
 #if CONFIG_NETWORK
 #include "libavformat/network.h"
 #endif
index 1f9ed15..99fac77 100755 (executable)
--- a/configure
+++ b/configure
@@ -4921,7 +4921,6 @@ 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 c68cb16..d124d4e 100644 (file)
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -24,6 +24,7 @@
  */
 
 #include "config.h"
+#include "version.h"
 
 #include <string.h>