diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-03 20:53:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-03 20:53:00 +0200 |
| commit | 9400603140db5f44f35942482a3435e4b67e7e79 (patch) | |
| tree | 6c78861678fbf746cc94214295cad1e1d387f8a2 /libavcodec/version.h | |
| parent | 76aec9e6b4a2aabe659013198620276822420ad9 (diff) | |
| parent | 9f17685dfb70a73823aca16ad246ee3b831d1de8 (diff) | |
| download | ffmpeg-9400603140db5f44f35942482a3435e4b67e7e79.tar.gz | |
Merge commit '9f17685dfb70a73823aca16ad246ee3b831d1de8'
* commit '9f17685dfb70a73823aca16ad246ee3b831d1de8':
avcodec: Deprecate unused defines and options
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index c341a01ee8..e794635d59 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 71 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -150,6 +150,9 @@ #ifndef FF_API_ARCH_SPARC #define FF_API_ARCH_SPARC (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_UNUSED_MEMBERS +#define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #ifndef FF_API_INPUT_PRESERVED #define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 57) #endif |