diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 14:24:14 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 14:24:19 +0100 |
commit | a13148f63351db5f8283a23de9a22e940d29d8cd (patch) | |
tree | 7a9a10399626bebfc3f63f6b30087f06ae178e2f /libavcodec/avcodec.h | |
parent | 86270236d5ef97263858a576fab2c366fb2aa76a (diff) | |
parent | 8e134e5104e99a69cd4cea10540a7ce9c3682a2c (diff) |
Merge commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c'
* commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c':
lavc: clarify get_buffer() documentation
mpegaudiodec: use planar sample format for output unless packed is requested
x86: h264 qpel: use the correct number of utilized xmm regs in cglobal
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5ebad92604..b6a4b0ec24 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2406,7 +2406,12 @@ typedef struct AVCodecContext { * * Decoders cannot use the buffer after returning from * avcodec_decode_audio4(), so they will not call release_buffer(), as it - * is assumed to be released immediately upon return. + * is assumed to be released immediately upon return. In some rare cases, + * a decoder may need to call get_buffer() more than once in a single + * call to avcodec_decode_audio4(). In that case, when get_buffer() is + * called again after it has already been called once, the previously + * acquired buffer is assumed to be released at that time and may not be + * reused by the decoder. * * As a convenience, av_samples_get_buffer_size() and * av_samples_fill_arrays() in libavutil may be used by custom get_buffer() |