aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-28 00:19:45 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-28 00:19:45 +0100
commit0075a22f415f7130a2fa9d81e55047a9bd18d0fa (patch)
tree4caa4c7dd12a17309089fb1db9cb7028036fc31d
parentca21116b3f53a9bdd74364bfab9cde70a044b165 (diff)
downloadffmpeg-0075a22f415f7130a2fa9d81e55047a9bd18d0fa.tar.gz
Revert "configure: add #include "version.h" to config.h"
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. "
-rw-r--r--cmdutils.c1
-rwxr-xr-xconfigure1
-rw-r--r--ffprobe.c1
3 files changed, 2 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c
index 95accb0094..2608bceb3d 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -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
diff --git a/configure b/configure
index 1f9ed15a1b..99fac771fb 100755
--- 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)"
diff --git a/ffprobe.c b/ffprobe.c
index c68cb16fe1..d124d4eb01 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -24,6 +24,7 @@
*/
#include "config.h"
+#include "version.h"
#include <string.h>