[FFmpeg-cvslog] lavu: improve documentation of some AVFrame functions

wm4 git at videolan.org
Wed Apr 13 17:11:54 CEST 2016


ffmpeg | branch: master | wm4 <nfxjfg at googlemail.com> | Mon Feb 29 22:48:11 2016 +0100| [7a6cf2771414c7ab8bca0811d589f6091a6e2b71] | committer: Anton Khirnov

lavu: improve documentation of some AVFrame functions

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a6cf2771414c7ab8bca0811d589f6091a6e2b71
---

 libavutil/frame.h |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/libavutil/frame.h b/libavutil/frame.h
index 5a04177..a39a1ef 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -391,6 +391,10 @@ void av_frame_free(AVFrame **frame);
  * If src is not reference counted, new buffers are allocated and the data is
  * copied.
  *
+ * @warning: dst MUST have been either unreferenced with av_frame_unref(dst),
+ *           or newly allocated with av_frame_alloc() before calling this
+ *           function, or undefined behavior will occur.
+ *
  * @return 0 on success, a negative AVERROR on error
  */
 int av_frame_ref(AVFrame *dst, const AVFrame *src);
@@ -410,7 +414,11 @@ AVFrame *av_frame_clone(const AVFrame *src);
 void av_frame_unref(AVFrame *frame);
 
 /**
- * Move everythnig contained in src to dst and reset src.
+ * Move everything contained in src to dst and reset src.
+ *
+ * @warning: dst is not unreferenced, but directly overwritten without reading
+ *           or deallocating its contents. Call av_frame_unref(dst) manually
+ *           before calling this function to ensure that no memory is leaked.
  */
 void av_frame_move_ref(AVFrame *dst, AVFrame *src);
 
@@ -426,6 +434,10 @@ void av_frame_move_ref(AVFrame *dst, AVFrame *src);
  * necessary, allocate and fill AVFrame.extended_data and AVFrame.extended_buf.
  * For planar formats, one buffer will be allocated for each plane.
  *
+ * @warning: if frame already has been allocated, calling this function will
+ *           leak memory. In addition, undefined behavior can occur in certain
+ *           cases.
+ *
  * @param frame frame in which to store the new buffers.
  * @param align required buffer size alignment
  *



More information about the ffmpeg-cvslog mailing list