summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2013-11-26 14:43:18 -0800
committerMichael Niedermayer <michaelni@gmx.at>2013-11-27 23:06:13 +0100
commitca21116b3f53a9bdd74364bfab9cde70a044b165 (patch)
tree0ae66cab9aeb380a966e4496e67d2fa519f9e7db /configure
parentb723c4e67e20eb86673316cb944184d0f3f6fe5e (diff)
configure: add #include "version.h" to config.h
Avoid clash with version.h of the libraries. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure b/configure
index 99fac771fb..1f9ed15a1b 100755
--- a/configure
+++ b/configure
@@ -4921,6 +4921,7 @@ 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)"