Module: libav Branch: master Commit: d803775e81bdff4e7f639b3e47c0a6e6f05219c3
Author: Anton Khirnov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Sun Jan 22 10:56:42 2012 +0100 lavc: remove disabled FF_API_DATA_POINTERS cruft. --- libavcodec/avcodec.h | 4 ---- libavcodec/version.h | 3 --- 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8a048d2..217bef2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -854,11 +854,7 @@ enum AVSideDataParamChangeFlags { * sizeof(AVFrame) must not be used outside libav*. */ typedef struct AVFrame { -#if FF_API_DATA_POINTERS -#define AV_NUM_DATA_POINTERS 4 -#else #define AV_NUM_DATA_POINTERS 8 -#endif /** * pointer to the picture/channel planes. * This might be different from the first allocated byte diff --git a/libavcodec/version.h b/libavcodec/version.h index b725bb0..c630bf2 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -41,9 +41,6 @@ #ifndef FF_API_REQUEST_CHANNELS #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55) #endif -#ifndef FF_API_DATA_POINTERS -#define FF_API_DATA_POINTERS (LIBAVCODEC_VERSION_MAJOR < 54) -#endif #ifndef FF_API_OLD_DECODE_AUDIO #define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 55) #endif _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
