diff options
author | Anton Khirnov <anton@khirnov.net> | 2013-02-23 08:20:12 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2013-03-09 08:36:40 +0100 |
commit | f073b1500e3b53835034b7421db0a1cf5bea05a0 (patch) | |
tree | 34c6a8ff1bc639596c56c9419afb7c83bad22034 /libavcodec/avcodec.h | |
parent | 5d606863c353553488e88dfd89ea5571268d9dca (diff) | |
download | ffmpeg-f073b1500e3b53835034b7421db0a1cf5bea05a0.tar.gz |
lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7bc7b618c7..0d4ac318cd 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3685,36 +3685,6 @@ AVCodec *avcodec_find_encoder(enum AVCodecID id); */ AVCodec *avcodec_find_encoder_by_name(const char *name); -#if FF_API_OLD_ENCODE_AUDIO -/** - * Encode an audio frame from samples into buf. - * - * @deprecated Use avcodec_encode_audio2 instead. - * - * @note The output buffer should be at least FF_MIN_BUFFER_SIZE bytes large. - * However, for codecs with avctx->frame_size equal to 0 (e.g. PCM) the user - * will know how much space is needed because it depends on the value passed - * in buf_size as described below. In that case a lower value can be used. - * - * @param avctx the codec context - * @param[out] buf the output buffer - * @param[in] buf_size the output buffer size - * @param[in] samples the input buffer containing the samples - * The number of samples read from this buffer is frame_size*channels, - * both of which are defined in avctx. - * For codecs which have avctx->frame_size equal to 0 (e.g. PCM) the number of - * samples read from samples is equal to: - * buf_size * 8 / (avctx->channels * av_get_bits_per_sample(avctx->codec_id)) - * This also implies that av_get_bits_per_sample() must not return 0 for these - * codecs. - * @return On error a negative value is returned, on success zero or the number - * of bytes used to encode the data read from the input buffer. - */ -int attribute_deprecated avcodec_encode_audio(AVCodecContext *avctx, - uint8_t *buf, int buf_size, - const short *samples); -#endif - /** * Encode a frame of audio. * |