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

Stefano Sabatini stefasab at gmail.com
Wed Nov 27 10:06:09 CET 2013


On date Tuesday 2013-11-26 14:43:18 -0800, Timothy Gu encoded:
> Avoid clash with version.h of the libraries.
> 
> Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
> ---
>  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 aaf5c8f..317b112 100755
> --- a/configure
> +++ b/configure
> @@ -4919,6 +4919,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>

Not sure, what problem is this addressing?
-- 
FFmpeg = Free Fostering Meaningful Practical Extroverse Gorilla


More information about the ffmpeg-devel mailing list