diff options
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 25914282dc..ed39c0c3f1 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1523,54 +1523,6 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi return ret; } -#if FF_API_OLD_DECODE_AUDIO -int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples, - int *frame_size_ptr, - AVPacket *avpkt) -{ - AVFrame frame = { { 0 } }; - int ret, got_frame = 0; - - if (avctx->get_buffer != avcodec_default_get_buffer) { - av_log(avctx, AV_LOG_ERROR, "Custom get_buffer() for use with" - "avcodec_decode_audio3() detected. Overriding with avcodec_default_get_buffer\n"); - av_log(avctx, AV_LOG_ERROR, "Please port your application to " - "avcodec_decode_audio4()\n"); - avctx->get_buffer = avcodec_default_get_buffer; - } - - ret = avcodec_decode_audio4(avctx, &frame, &got_frame, avpkt); - - if (ret >= 0 && got_frame) { - int ch, plane_size; - int planar = av_sample_fmt_is_planar(avctx->sample_fmt); - int data_size = av_samples_get_buffer_size(&plane_size, avctx->channels, - frame.nb_samples, - avctx->sample_fmt, 1); - if (*frame_size_ptr < data_size) { - av_log(avctx, AV_LOG_ERROR, "output buffer size is too small for " - "the current frame (%d < %d)\n", *frame_size_ptr, data_size); - return AVERROR(EINVAL); - } - - memcpy(samples, frame.extended_data[0], plane_size); - - if (planar && avctx->channels > 1) { - uint8_t *out = ((uint8_t *)samples) + plane_size; - for (ch = 1; ch < avctx->channels; ch++) { - memcpy(out, frame.extended_data[ch], plane_size); - out += plane_size; - } - } - *frame_size_ptr = data_size; - } else { - *frame_size_ptr = 0; - } - return ret; -} - -#endif - int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, |