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:33 +0100 |
| commit | 284e65d64ea91dc172dea1b843d162b22ed48730 (patch) | |
| tree | 500fb686063a9ca06ead0f6e8d0b2b2b30c45f7e /libavcodec/avcodec.h | |
| parent | 6c8dab98b87040ab3d5d31b91a46eb4aed8f1f30 (diff) | |
| download | ffmpeg-284e65d64ea91dc172dea1b843d162b22ed48730.tar.gz | |
lavc: remove disabled FF_API_OLD_SAMPLE_FMT cruft.
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5a5c4be6bb..a31c63e09b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -424,18 +424,6 @@ enum CodecID { CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. }; -#if FF_API_OLD_SAMPLE_FMT -#define SampleFormat AVSampleFormat - -#define SAMPLE_FMT_NONE AV_SAMPLE_FMT_NONE -#define SAMPLE_FMT_U8 AV_SAMPLE_FMT_U8 -#define SAMPLE_FMT_S16 AV_SAMPLE_FMT_S16 -#define SAMPLE_FMT_S32 AV_SAMPLE_FMT_S32 -#define SAMPLE_FMT_FLT AV_SAMPLE_FMT_FLT -#define SAMPLE_FMT_DBL AV_SAMPLE_FMT_DBL -#define SAMPLE_FMT_NB AV_SAMPLE_FMT_NB -#endif - #if FF_API_OLD_AUDIOCONVERT #include "libavutil/audioconvert.h" @@ -4197,14 +4185,6 @@ char av_get_pict_type_char(int pict_type); */ int av_get_bits_per_sample(enum CodecID codec_id); -#if FF_API_OLD_SAMPLE_FMT -/** - * @deprecated Use av_get_bytes_per_sample() instead. - */ -attribute_deprecated -int av_get_bits_per_sample_format(enum AVSampleFormat sample_fmt); -#endif - /* frame parsing */ typedef struct AVCodecParserContext { void *priv_data; |