diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 14:48:00 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-04-19 18:37:03 +0200 |
commit | 9b4f1cdb6a7e838c0261109e8a6262e78657ee7b (patch) | |
tree | 04b969fa8f50a153852d82d208301d460fd6477b /libavcodec/avcodec.h | |
parent | 20d33ee8b1d2cf5ba4b4d4a81db0ff7b4a125dd3 (diff) | |
download | ffmpeg-streaming-9b4f1cdb6a7e838c0261109e8a6262e78657ee7b.zip ffmpeg-streaming-9b4f1cdb6a7e838c0261109e8a6262e78657ee7b.tar.gz |
lavc: remove the FF_API_AUDIO_OLD cruft.
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5d85b41..cf3664a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3227,14 +3227,6 @@ struct AVResampleContext; typedef struct ReSampleContext ReSampleContext; -#if FF_API_AUDIO_OLD -/** - * @deprecated Use av_audio_resample_init() instead. - */ -attribute_deprecated ReSampleContext *audio_resample_init(int output_channels, int input_channels, - int output_rate, int input_rate); -#endif - /** * Initialize audio resampling context. * @@ -3706,25 +3698,6 @@ int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, */ int avcodec_open(AVCodecContext *avctx, AVCodec *codec); -#if FF_API_AUDIO_OLD -/** - * Decode an audio frame from buf into samples. - * Wrapper function which calls avcodec_decode_audio3. - * - * @deprecated Use avcodec_decode_audio3 instead. - * @param avctx the codec context - * @param[out] samples the output buffer - * @param[in,out] frame_size_ptr the output buffer size in bytes - * @param[in] buf the input buffer - * @param[in] buf_size the input buffer size in bytes - * @return On error a negative value is returned, otherwise the number of bytes - * used or zero if no frame could be decompressed. - */ -attribute_deprecated int avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples, - int *frame_size_ptr, - const uint8_t *buf, int buf_size); -#endif - /** * Decode the audio frame of size avpkt->size from avpkt->data into samples. * Some decoders may support multiple frames in a single AVPacket, such |