提交 ca21116b 编写于 作者: T Timothy Gu 提交者: Michael Niedermayer

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

Avoid clash with version.h of the libraries.
Signed-off-by: NTimothy Gu <timothygu99@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
上级 b723c4e6
......@@ -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
......
......@@ -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)"
......
......@@ -24,7 +24,6 @@
*/
#include "config.h"
#include "version.h"
#include <string.h>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册