summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-06-07 19:30:54 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-06-07 19:30:54 +0000
commitf1b99cc63b2fe0fccec277429016bd5a7c0b5b56 (patch)
tree0f38dab4c0c421021cbc2e05cc487e69f33ecdc8
parent1e15e5366f7d55d3979447746f64770a7f1c5a63 (diff)
Clarify (re)get_buffer() and CODEC_CAP_DR1 relation.
Originally committed as revision 19132 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/avcodec.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 900e3b5301..aaa95b55bc 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1331,6 +1331,9 @@ typedef struct AVCodecContext {
* If pic.reference is set then the frame will be read later by libavcodec.
* avcodec_align_dimensions() should be used to find the required width and
* height, as they normally need to be rounded up to the next multiple of 16.
+ * if CODEC_CAP_DR1 is not set then get_buffer() must call
+ * avcodec_default_get_buffer() instead of providing buffers allocated by
+ * some other means.
* - encoding: unused
* - decoding: Set by libavcodec., user can override.
*/
@@ -1959,6 +1962,9 @@ typedef struct AVCodecContext {
* libavcodec will pass previous buffer in pic, function should return
* same buffer or new buffer with old frame "painted" into it.
* If pic.data[0] == NULL must behave like get_buffer().
+ * if CODEC_CAP_DR1 is not set then reget_buffer() must call
+ * avcodec_default_reget_buffer() instead of providing buffers allocated by
+ * some other means.
* - encoding: unused
* - decoding: Set by libavcodec., user can override
*/