From c3846e3ebab610be691adb8b40d376dc2f675dc4 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 21 Dec 2011 15:49:56 +0100
Subject: [PATCH] lavc: Do not fail audio decoding if user has set a custom
get_buffer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/utils.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 7bf729dac7f..03e367f4c2e 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -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);
--
GitLab