highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "configure: add #include "version.h" to config.h"

Browse Source 
This reverts commit ca21116b3f.

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.
"
This commit is contained in:
Michael Niedermayer
2013-11-28 00:19:45 +01:00
parent ca21116b3f
commit 0075a22f41
3 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmdutils.c
View File

@ -50,6 +50,7 @@
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "cmdutils.h" #include "cmdutils.h"
#include "version.h"
#if CONFIG_NETWORK #if CONFIG_NETWORK
#include "libavformat/network.h" #include "libavformat/network.h"
#endif #endif

1
configure vendored
View File

@ -4921,7 +4921,6 @@ cat > $TMPH <<EOF
#define FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H
#define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)" #define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)"
#define FFMPEG_LICENSE "$(c_escape $license)" #define FFMPEG_LICENSE "$(c_escape $license)"
#include "version.h"
#define CONFIG_THIS_YEAR 2013 #define CONFIG_THIS_YEAR 2013
#define FFMPEG_DATADIR "$(eval c_escape $datadir)" #define FFMPEG_DATADIR "$(eval c_escape $datadir)"
#define AVCONV_DATADIR "$(eval c_escape $datadir)" #define AVCONV_DATADIR "$(eval c_escape $datadir)"

1
ffprobe.c
View File

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