From ca21116b3f53a9bdd74364bfab9cde70a044b165 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 26 Nov 2013 14:43:18 -0800
Subject: [PATCH] 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>
---
 cmdutils.c | 1 -
 configure  | 1 +
 ffprobe.c  | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cmdutils.c b/cmdutils.c
index 2608bceb3d..95accb0094 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -50,7 +50,6 @@
 #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 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)"
diff --git a/ffprobe.c b/ffprobe.c
index d124d4eb01..c68cb16fe1 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -24,7 +24,6 @@
  */
 
 #include "config.h"
-#include "version.h"
 
 #include <string.h>