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

[Timothy Gu]

ffmpeg | branch: master | Timothy Gu <timothygu99 at gmail.com> | Tue Nov 26 14:43:18 2013 -0800| [ca21116b3f53a9bdd74364bfab9cde70a044b165] | committer: Michael Niedermayer

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

Avoid clash with version.h of the libraries.

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

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