diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 23:21:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 23:21:23 +0200 |
| commit | e3ec2cde2c394af6c9b64bccd39bc206a88a4e58 (patch) | |
| tree | 0b92c7fb4a905429cbac55bf810575d8b656f12a /libavcodec | |
| parent | 29d147c94dd40a78ca3981f39365cc77dae9a0da (diff) | |
| parent | b94ec30428b9696f99b08055735689623fe63954 (diff) | |
Merge commit 'b94ec30428b9696f99b08055735689623fe63954'
* commit 'b94ec30428b9696f99b08055735689623fe63954':
lavc: Update version and APIchanges
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8163a992a1..aebb71f436 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -641,6 +641,7 @@ typedef struct AVCodecDescriptor { */ #define AV_INPUT_BUFFER_MIN_SIZE 16384 +#if FF_API_WITHOUT_PREFIX /** * @deprecated use AV_INPUT_BUFFER_PADDING_SIZE instead */ @@ -650,6 +651,7 @@ typedef struct AVCodecDescriptor { * @deprecated use AV_INPUT_BUFFER_MIN_SIZE instead */ #define FF_MIN_BUFFER_SIZE 16384 +#endif /* FF_API_WITHOUT_PREFIX */ /** * @ingroup lavc_encoding @@ -941,6 +943,7 @@ typedef struct RcOverride{ #define AV_CODEC_CAP_LOSSLESS 0x80000000 +#if FF_API_WITHOUT_PREFIX /** * Allow decoders to produce frames with data planes that are not aligned * to CPU requirements (e.g. due to cropping). @@ -1131,6 +1134,7 @@ typedef struct RcOverride{ * codecs */ #define HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200 +#endif /* FF_API_WITHOUT_PREFIX */ #if FF_API_MB_TYPE //The following defines may change, don't expect compatibility if you use them. diff --git a/libavcodec/version.h b/libavcodec/version.h index c29b4a4598..71032a5c99 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 56 -#define LIBAVCODEC_VERSION_MINOR 55 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 56 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -202,5 +202,8 @@ #ifndef FF_API_MOTION_EST #define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_WITHOUT_PREFIX +#define FF_API_WITHOUT_PREFIX (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #endif /* AVCODEC_VERSION_H */ |