summaryrefslogtreecommitdiff
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-21 15:49:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-21 15:49:56 +0100
commitc3846e3ebab610be691adb8b40d376dc2f675dc4 (patch)
tree676348c988c83635aedc64fb0a0d9234a271297d /libavcodec/utils.c
parent077b086dea113182468f2b4e5cad8d166b06c084 (diff)
lavc: Do not fail audio decoding if user has set a custom get_buffer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r--libavcodec/utils.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 7bf729dac7..03e367f4c2 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);