Browse Source

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>
tags/n2.2-rc1
Timothy Gu Michael Niedermayer 11 years ago
parent
commit
ca21116b3f
3 changed files with 1 additions and 2 deletions
  1. +0
    -1
      cmdutils.c
  2. +1
    -0
      configure
  3. +0
    -1
      ffprobe.c

+ 0
- 1
cmdutils.c View File

@@ -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


+ 1
- 0
configure View File

@@ -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)"


+ 0
- 1
ffprobe.c View File

@@ -24,7 +24,6 @@
*/

#include "config.h"
#include "version.h"

#include <string.h>



Loading…
Cancel
Save