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:34 +0100 |
| commit | fbca04e6f6567bcdb81549450f7e8345a6a8df11 (patch) | |
| tree | edcb35cf4be304e3c5c007785885cfbf003181ba | |
| parent | 9a79bb552a518f26bec1b5306a03b76076bcf8eb (diff) | |
| download | ffmpeg-fbca04e6f6567bcdb81549450f7e8345a6a8df11.tar.gz | |
lavc: remove disabled FF_API_OLD_FF_PICT_TYPES cruft.
| -rw-r--r-- | libavcodec/avcodec.h | 23 | ||||
| -rw-r--r-- | libavcodec/utils.c | 6 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 32 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 778b328674..1cbc56df30 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -783,17 +783,6 @@ typedef struct AVPanScan{ #define FF_BUFFER_TYPE_SHARED 4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared. #define FF_BUFFER_TYPE_COPY 8 ///< Just a (modified) copy of some other buffer, don't deallocate anything. -#if FF_API_OLD_FF_PICT_TYPES -/* DEPRECATED, directly use the AV_PICTURE_TYPE_* enum values */ -#define FF_I_TYPE AV_PICTURE_TYPE_I ///< Intra -#define FF_P_TYPE AV_PICTURE_TYPE_P ///< Predicted -#define FF_B_TYPE AV_PICTURE_TYPE_B ///< Bi-dir predicted -#define FF_S_TYPE AV_PICTURE_TYPE_S ///< S(GMC)-VOP MPEG4 -#define FF_SI_TYPE AV_PICTURE_TYPE_SI ///< Switching Intra -#define FF_SP_TYPE AV_PICTURE_TYPE_SP ///< Switching Predicted -#define FF_BI_TYPE AV_PICTURE_TYPE_BI -#endif - #define FF_BUFFER_HINTS_VALID 0x01 // Buffer hints value is meaningful (if 0 ignore). #define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer. #define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content. @@ -4096,18 +4085,6 @@ void avcodec_default_free_buffers(AVCodecContext *s); /* misc useful functions */ -#if FF_API_OLD_FF_PICT_TYPES -/** - * Return a single letter to describe the given picture type pict_type. - * - * @param[in] pict_type the picture type - * @return A single character representing the picture type. - * @deprecated Use av_get_picture_type_char() instead. - */ -attribute_deprecated -char av_get_pict_type_char(int pict_type); -#endif - /** * Return codec bits per sample. * diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 7f8009d7f9..2101df145d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1603,12 +1603,6 @@ void avcodec_default_free_buffers(AVCodecContext *avctx) } } -#if FF_API_OLD_FF_PICT_TYPES -char av_get_pict_type_char(int pict_type){ - return av_get_picture_type_char(pict_type); -} -#endif - int av_get_bits_per_sample(enum CodecID codec_id){ switch(codec_id){ case CODEC_ID_ADPCM_SBPRO_2: diff --git a/libavcodec/version.h b/libavcodec/version.h index 7b2bd188de..ace2f355e1 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_OLD_FF_PICT_TYPES -#define FF_API_OLD_FF_PICT_TYPES (LIBAVCODEC_VERSION_MAJOR < 54) -#endif #ifndef FF_API_FLAC_GLOBAL_OPTS #define FF_API_FLAC_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54) #endif |