Browse Source

lavc: Do not fail audio decoding if user has set a custom get_buffer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.10
Michael Niedermayer 14 years ago
parent
commit
c3846e3eba
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      libavcodec/utils.c

+ 3
- 2
libavcodec/utils.c View File

@@ -991,9 +991,10 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa
int ret, got_frame = 0;

if (avctx->get_buffer != avcodec_default_get_buffer) {
av_log(avctx, AV_LOG_ERROR, "A custom get_buffer() cannot be used with "
av_log(avctx, AV_LOG_ERROR, "Overriding custom get_buffer() for "
"avcodec_decode_audio3()\n");
return AVERROR(EINVAL);
avctx->get_buffer = avcodec_default_get_buffer;
avctx->release_buffer = avcodec_default_release_buffer;
}

ret = avcodec_decode_audio4(avctx, &frame, &got_frame, avpkt);


Loading…
Cancel
Save