diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-22 10:56:42 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:38:35 +0100 |
| commit | d803775e81bdff4e7f639b3e47c0a6e6f05219c3 (patch) | |
| tree | 509fe658ae29361c33d938aa4dc245883909ab62 | |
| parent | 10e1ae5efffb8dd2a1932b4d965dbc6dd3338e70 (diff) | |
| download | ffmpeg-d803775e81bdff4e7f639b3e47c0a6e6f05219c3.tar.gz | |
lavc: remove disabled FF_API_DATA_POINTERS cruft.
| -rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8a048d2d93..217bef2cc5 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 b725bb0057..c630bf2e57 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 |