[FFmpeg-cvslog] Merge commit '7a6cf2771414c7ab8bca0811d589f6091a6e2b71'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Apr 13 16:11:39 2016 +0100| [be6b58a98171030687cb0a770589207a5811c92d] | committer: Derek Buitenhuis

Merge commit '7a6cf2771414c7ab8bca0811d589f6091a6e2b71'

* commit '7a6cf2771414c7ab8bca0811d589f6091a6e2b71':
  lavu: improve documentation of some AVFrame functions

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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

 libavutil/frame.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavutil/frame.h b/libavutil/frame.h
index 89f41fc..2d6299b 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -634,8 +634,9 @@ 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, undefined behaviour, including
- *           memory leaks, can occur.
+ * @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


======================================================================