apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-19 07:05:53 +08:00
Code Issues 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
parent 29d147c94d b94ec30428
commit e3ec2cde2c
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/avcodec.h
View File

@@ -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.