har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'b94ec30428b9696f99b08055735689623fe63954'

Browse Source 
* commit 'b94ec30428b9696f99b08055735689623fe63954':
  lavc: Update version and APIchanges

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-27 23:21:23 +02:00
commit e3ec2cde2c
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/APIchanges
View File

@ -15,6 +15,12 @@ libavutil: 2014-08-09
API changes, most recent first: API changes, most recent first:
2015-xx-xx - lavc 56.35.0 - avcodec.h
xxxxxxxxx - Rename CODEC_FLAG* defines to AV_CODEC_FLAG*.
xxxxxxxxx - Rename CODEC_CAP_* defines to AV_CODEC_CAP_*.
xxxxxxxxx - Rename FF_INPUT_BUFFER_PADDING_SIZE and FF_MIN_BUFFER_SIZE
to AV_INPUT_BUFFER_PADDING_SIZE and AV_INPUT_BUFFER_MIN_SIZE.
2015-xx-xx - xxxxxxx - lavc 56.51.100 - avcodec.h 2015-xx-xx - xxxxxxx - lavc 56.51.100 - avcodec.h
Add AV_PKT_DATA_QUALITY_STATS to export the quality value, PSNR, and pict_type Add AV_PKT_DATA_QUALITY_STATS to export the quality value, PSNR, and pict_type
of an AVPacket. of an AVPacket.

4
libavcodec/avcodec.h
View File

@ -641,6 +641,7 @@ typedef struct AVCodecDescriptor {
*/ */
#define AV_INPUT_BUFFER_MIN_SIZE 16384 #define AV_INPUT_BUFFER_MIN_SIZE 16384
#if FF_API_WITHOUT_PREFIX
/** /**
* @deprecated use AV_INPUT_BUFFER_PADDING_SIZE instead * @deprecated use AV_INPUT_BUFFER_PADDING_SIZE instead
*/ */
@ -650,6 +651,7 @@ typedef struct AVCodecDescriptor {
* @deprecated use AV_INPUT_BUFFER_MIN_SIZE instead * @deprecated use AV_INPUT_BUFFER_MIN_SIZE instead
*/ */
#define FF_MIN_BUFFER_SIZE 16384 #define FF_MIN_BUFFER_SIZE 16384
#endif /* FF_API_WITHOUT_PREFIX */
/** /**
* @ingroup lavc_encoding * @ingroup lavc_encoding
@ -941,6 +943,7 @@ typedef struct RcOverride{
#define AV_CODEC_CAP_LOSSLESS 0x80000000 #define AV_CODEC_CAP_LOSSLESS 0x80000000
#if FF_API_WITHOUT_PREFIX
/** /**
* Allow decoders to produce frames with data planes that are not aligned * Allow decoders to produce frames with data planes that are not aligned
* to CPU requirements (e.g. due to cropping). * to CPU requirements (e.g. due to cropping).
@ -1131,6 +1134,7 @@ typedef struct RcOverride{
* codecs * codecs
*/ */
#define HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200 #define HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200
#endif /* FF_API_WITHOUT_PREFIX */
#if FF_API_MB_TYPE #if FF_API_MB_TYPE
//The following defines may change, don't expect compatibility if you use them. //The following defines may change, don't expect compatibility if you use them.

7
libavcodec/version.h
View File

@ -29,8 +29,8 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 56 #define LIBAVCODEC_VERSION_MAJOR 56
#define LIBAVCODEC_VERSION_MINOR 55 #define LIBAVCODEC_VERSION_MINOR 56
#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \
@ -202,5 +202,8 @@
#ifndef FF_API_MOTION_EST #ifndef FF_API_MOTION_EST
#define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 59) #define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 59)
#endif #endif
#ifndef FF_API_WITHOUT_PREFIX
#define FF_API_WITHOUT_PREFIX (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#endif /* AVCODEC_VERSION_H */ #endif /* AVCODEC_VERSION_H */