Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

lavc: remove disabled FF_API_DATA_POINTERS cruft.

Browse source
This commit is contained in:
Anton Khirnov 2012-01-22 10:56:42 +01:00
parent 10e1ae5eff
commit d803775e81
2 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libavcodec/avcodec.h
View file

@ -854,11 +854,7 @@ enum AVSideDataParamChangeFlags {
* sizeof(AVFrame) must not be used outside libav*. * sizeof(AVFrame) must not be used outside libav*.
*/ */
typedef struct AVFrame { typedef struct AVFrame {
#if FF_API_DATA_POINTERS
#define AV_NUM_DATA_POINTERS 4
#else
#define AV_NUM_DATA_POINTERS 8 #define AV_NUM_DATA_POINTERS 8
#endif
/** /**
* pointer to the picture/channel planes. * pointer to the picture/channel planes.
* This might be different from the first allocated byte * This might be different from the first allocated byte

3
libavcodec/version.h
View file

@ -41,9 +41,6 @@
#ifndef FF_API_REQUEST_CHANNELS #ifndef FF_API_REQUEST_CHANNELS
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55) #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
#endif #endif
#ifndef FF_API_DATA_POINTERS
#define FF_API_DATA_POINTERS (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_OLD_DECODE_AUDIO #ifndef FF_API_OLD_DECODE_AUDIO
#define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 55) #define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 55)
#endif #endif