Sfoglia il codice sorgente

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.
"
Michael Niedermayer 12 anni fa
parent
commit
0075a22f41
3 ha cambiato i file con 2 aggiunte e 1 eliminazioni
  1. 1 0
      cmdutils.c
  2. 0 1
      configure
  3. 1 0
      ffprobe.c

+ 1 - 0
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

+ 0 - 1
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)"

+ 1 - 0
ffprobe.c

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