diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 02:48:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 02:48:19 +0200 |
| commit | 8e8219e0f0725116809cdd1c17c868cb08da0dec (patch) | |
| tree | eccf6f91c9ff4d49aaa71727640934cec80fcfa0 /libavutil/version.h | |
| parent | 93db2708d3b0bcc1f1d87d23ae8adbedd8ea6660 (diff) | |
| parent | c253340ae6f74ffd8798bbd476e46d1b33a2d56e (diff) | |
| download | ffmpeg-8e8219e0f0725116809cdd1c17c868cb08da0dec.tar.gz | |
Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e'
* commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e':
log: Introduce a more verbose debug level
Conflicts:
doc/APIchanges
doc/fftools-common-opts.texi
libavutil/log.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index a3d95d8c57..ec3f586ead 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,8 +56,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 54 -#define LIBAVUTIL_VERSION_MINOR 22 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 23 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ @@ -119,6 +119,9 @@ #ifndef FF_API_OPT_TYPE_METADATA #define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 55) #endif +#ifndef FF_API_DLOG +#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 55) +#endif #ifndef FF_CONST_AVUTIL55 #if LIBAVUTIL_VERSION_MAJOR >= 55 |