diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2013-11-28 16:29:41 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 21:42:55 +0100 |
| commit | 82b2e9cb1d7e2c24db7d17d0c41bf1cef9a959b3 (patch) | |
| tree | 9abe2fac34d224c8f6fe97d0028cb661687ac2c2 /libavutil | |
| parent | c5806910918eb9adc3b3a821242cc4bc7647a50f (diff) | |
build: rename version.h to libavutil/ffversion.h
Also the libavutil/ffversion.h will be installed.
Rationale:
* Applications might want to know FFmpeg's version besides the individual
libraries'.
* Avoids file name clash between FFmpeg's ./version.h and lib*/version.h when
a library source file includes both and is compiled on an out-of-tree build.
Fixes #1769.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/Makefile | 3 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 02dd728d66..8b73019cd5 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -62,7 +62,8 @@ ARCH_HEADERS = bswap.h \ intreadwrite.h \ timer.h \ -BUILT_HEADERS = avconfig.h +BUILT_HEADERS = avconfig.h \ + ffversion.h OBJS = adler32.o \ aes.o \ diff --git a/libavutil/version.h b/libavutil/version.h index e9e80032dc..3c0461b262 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 55 +#define LIBAVUTIL_VERSION_MINOR 56 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |