[FFmpeg-cvslog] Revert "configure: add #include "version.h" to config.h"

Michael Niedermayer git at videolan.org
Thu Nov 28 00:28:12 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 28 00:19:45 2013 +0100| [0075a22f415f7130a2fa9d81e55047a9bd18d0fa] | committer: Michael Niedermayer

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.
"

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

 cmdutils.c |    1 +
 configure  |    1 -
 ffprobe.c  |    1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmdutils.c b/cmdutils.c
index 95accb0..2608bce 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 1f9ed15..99fac77 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 c68cb16..d124d4e 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -24,6 +24,7 @@
  */
 
 #include "config.h"
+#include "version.h"
 
 #include <string.h>
 



More information about the ffmpeg-cvslog mailing list