* commit 'b94ec30428b9696f99b08055735689623fe63954': lavc: Update version and APIchanges Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h
Unified · Split
| @@ -15,6 +15,12 @@ libavutil: 2014-08-09 · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | API changes, most recent first: |
| 17 | 17 | |
| 18 | +2015-xx-xx - lavc 56.35.0 - avcodec.h | |
| 19 | + xxxxxxxxx - Rename CODEC_FLAG* defines to AV_CODEC_FLAG*. | |
| 20 | + xxxxxxxxx - Rename CODEC_CAP_* defines to AV_CODEC_CAP_*. | |
| 21 | + xxxxxxxxx - Rename FF_INPUT_BUFFER_PADDING_SIZE and FF_MIN_BUFFER_SIZE | |
| 22 | + to AV_INPUT_BUFFER_PADDING_SIZE and AV_INPUT_BUFFER_MIN_SIZE. | |
| 23 | + | |
| 18 | 24 | 2015-xx-xx - xxxxxxx - lavc 56.51.100 - avcodec.h |
| 19 | 25 | Add AV_PKT_DATA_QUALITY_STATS to export the quality value, PSNR, and pict_type |
| 20 | 26 | of an AVPacket. |
| @@ -641,6 +641,7 @@ typedef struct AVCodecDescriptor { · 640 unmodified lines | ||
| 641 | 641 | */ |
| 642 | 642 | #define AV_INPUT_BUFFER_MIN_SIZE 16384 |
| 643 | 643 | |
| 644 | +#if FF_API_WITHOUT_PREFIX | |
| 644 | 645 | /** |
| 645 | 646 | * @deprecated use AV_INPUT_BUFFER_PADDING_SIZE instead |
| 646 | 647 | */ |
| @@ -650,6 +651,7 @@ typedef struct AVCodecDescriptor { · 3 unmodified lines | ||
| 650 | 651 | * @deprecated use AV_INPUT_BUFFER_MIN_SIZE instead |
| 651 | 652 | */ |
| 652 | 653 | #define FF_MIN_BUFFER_SIZE 16384 |
| 654 | +#endif /* FF_API_WITHOUT_PREFIX */ | |
| 653 | 655 | |
| 654 | 656 | /** |
| 655 | 657 | * @ingroup lavc_encoding |
| @@ -941,6 +943,7 @@ typedef struct RcOverride{ · 285 unmodified lines | ||
| 941 | 943 | #define AV_CODEC_CAP_LOSSLESS 0x80000000 |
| 942 | 944 | |
| 943 | 945 | |
| 946 | +#if FF_API_WITHOUT_PREFIX | |
| 944 | 947 | /** |
| 945 | 948 | * Allow decoders to produce frames with data planes that are not aligned |
| 946 | 949 | * to CPU requirements (e.g. due to cropping). |
| @@ -1131,6 +1134,7 @@ typedef struct RcOverride{ · 184 unmodified lines | ||
| 1131 | 1134 | * codecs |
| 1132 | 1135 | */ |
| 1133 | 1136 | #define HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200 |
| 1137 | +#endif /* FF_API_WITHOUT_PREFIX */ | |
| 1134 | 1138 | |
| 1135 | 1139 | #if FF_API_MB_TYPE |
| 1136 | 1140 | //The following defines may change, don't expect compatibility if you use them. |
| @@ -29,8 +29,8 @@ · 28 unmodified lines | ||
| 29 | 29 | #include "libavutil/version.h" |
| 30 | 30 | |
| 31 | 31 | #define LIBAVCODEC_VERSION_MAJOR 56 |
| 32 | −#define LIBAVCODEC_VERSION_MINOR 55 | |
| 33 | −#define LIBAVCODEC_VERSION_MICRO 101 | |
| 32 | +#define LIBAVCODEC_VERSION_MINOR 56 | |
| 33 | +#define LIBAVCODEC_VERSION_MICRO 100 | |
| 34 | 34 | |
| 35 | 35 | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
| 36 | 36 | LIBAVCODEC_VERSION_MINOR, \ |
| @@ -202,5 +202,8 @@ · 165 unmodified lines | ||
| 202 | 202 | #ifndef FF_API_MOTION_EST |
| 203 | 203 | #define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 59) |
| 204 | 204 | #endif |
| 205 | +#ifndef FF_API_WITHOUT_PREFIX | |
| 206 | +#define FF_API_WITHOUT_PREFIX (LIBAVCODEC_VERSION_MAJOR < 59) | |
| 207 | +#endif | |
| 205 | 208 | |
| 206 | 209 | #endif /* AVCODEC_VERSION_H */ |