generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4'

Browse Source 
* commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4':
  lavc: deprecate CODEC_CAP_NEG_LINESIZES

Conflicts:
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-11-16 23:36:33 +01:00
parent 484f8d77c6 b068660ffa
commit ec9aef5652
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/avcodec.h
View File

@@ -825,12 +825,12 @@ typedef struct RcOverride{
* Codec should fill in channel configuration and samplerate instead of container * Codec should fill in channel configuration and samplerate instead of container
*/ */
#define CODEC_CAP_CHANNEL_CONF 0x0400 #define CODEC_CAP_CHANNEL_CONF 0x0400
#if FF_API_NEG_LINESIZES
/** /**
* Codec is able to deal with negative linesizes * @deprecated no codecs use this capability
*/ */
#define CODEC_CAP_NEG_LINESIZES 0x0800 #define CODEC_CAP_NEG_LINESIZES 0x0800
#endif
/** /**
* Codec supports frame-level multithreading. * Codec supports frame-level multithreading.
*/ */

3
libavcodec/version.h
View File

@@ -135,5 +135,8 @@
#ifndef FF_API_FAST_MALLOC #ifndef FF_API_FAST_MALLOC
#define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 56) #define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 56)
#endif #endif
#ifndef FF_API_NEG_LINESIZES
#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
#endif /* AVCODEC_VERSION_H */ #endif /* AVCODEC_VERSION_H */