diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-16 01:20:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-16 01:33:35 +0100 |
| commit | 4a4c4278b716b49b9f1653df4ac4f1f026606081 (patch) | |
| tree | e1f9e2855fb0dc8a836ff795bd0eb95b48af30bd /libavcodec/utils.c | |
| parent | f94ce3bcab67369b18976f6cf8e69ae132805213 (diff) | |
| parent | 2df5f59ad0710a0d85114b73bd6a5094c26d08bc (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: split ADPCM and DPCM test references into separate files.
mov, mxfdec: Employ more meaningful return values.
lavc: Relax API strictness in avcodec_decode_audio3 with a custom get_buffer()
wavpack: fix clipping for 32-bit lossy mode
vb: Use bytestream2 functions
Conflicts:
libavcodec/utils.c
libavcodec/vb.c
libavformat/mxfdec.c
tests/fate/dpcm.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e25f1dfb41..462288446b 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1057,8 +1057,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, "Overriding custom get_buffer() for " - "avcodec_decode_audio3()\n"); + 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; avctx->release_buffer = avcodec_default_release_buffer; } |