diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-24 03:03:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-24 12:34:12 +0200 |
| commit | c41899a3770cb4510e15b223fa34d129305b1589 (patch) | |
| tree | a9926404ab857c5460d824a6177f441773dad76e | |
| parent | b5e6aa6c3337dc740d67aa68116530fe604bae76 (diff) | |
| download | ffmpeg-c41899a3770cb4510e15b223fa34d129305b1589.tar.gz | |
lavu: split version info into version.h
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavutil/Makefile | 1 | ||||
| -rw-r--r-- | libavutil/avutil.h | 24 | ||||
| -rw-r--r-- | libavutil/version.h | 51 |
4 files changed, 56 insertions, 23 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 2703610639..4cdea95921 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2011-04-18 API changes, most recent first: +2012-06-24 - xxxxxxx - lavu 51.62.100 - version.h + version moved from avutil.h to version.h + 2012-04-11 - xxxxxxx - lavu 51.58.100 - error.h Add av_make_error_string() and av_err2str() utilities to libavutil/error.h. diff --git a/libavutil/Makefile b/libavutil/Makefile index 4a9eb807a5..4d41784848 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -42,6 +42,7 @@ HEADERS = adler32.h \ time.h \ timecode.h \ timestamp.h \ + version.h \ ARCH_HEADERS = bswap.h \ intmath.h \ diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 0efaa952f4..5e521216a7 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -141,30 +141,8 @@ #define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) -/** - * @} - * - * @defgroup lavu_ver Version and Build diagnostics - * - * Macros and function useful to check at compiletime and at runtime - * which version of libavutil is in use. - * - * @{ - */ - -#define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 61 -#define LIBAVUTIL_VERSION_MICRO 100 - -#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ - LIBAVUTIL_VERSION_MINOR, \ - LIBAVUTIL_VERSION_MICRO) -#define LIBAVUTIL_VERSION AV_VERSION(LIBAVUTIL_VERSION_MAJOR, \ - LIBAVUTIL_VERSION_MINOR, \ - LIBAVUTIL_VERSION_MICRO) -#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT +#include "libavutil/version.h" -#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION) /** * @} diff --git a/libavutil/version.h b/libavutil/version.h new file mode 100644 index 0000000000..1e05844c1e --- /dev/null +++ b/libavutil/version.h @@ -0,0 +1,51 @@ +/* + * copyright (c) 2003 Fabrice Bellard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_VERSION_H +#define AVUTIL_VERSION_H + +/** + * @defgroup lavu_ver Version and Build diagnostics + * + * Macros and function useful to check at compiletime and at runtime + * which version of libavutil is in use. + * + * @{ + */ + +#define LIBAVUTIL_VERSION_MAJOR 51 +#define LIBAVUTIL_VERSION_MINOR 62 +#define LIBAVUTIL_VERSION_MICRO 100 + +#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ + LIBAVUTIL_VERSION_MINOR, \ + LIBAVUTIL_VERSION_MICRO) +#define LIBAVUTIL_VERSION AV_VERSION(LIBAVUTIL_VERSION_MAJOR, \ + LIBAVUTIL_VERSION_MINOR, \ + LIBAVUTIL_VERSION_MICRO) +#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT + +#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION) + +/** + * @} + */ + +#endif //AVUTIL_VERSION_H |