[FFmpeg-cvslog] Merge commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e'

[Hendrik Leppkes]

ffmpeg | branch: release/3.1 | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Jun 26 14:35:10 2016 +0200| [f9a186c59b4c8fc65dd8298e62a76cb4a01ffc13] | committer: Hendrik Leppkes

Merge commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e'

* commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e':
  lavc: document that avcodec_close() should not be used

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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

 libavcodec/avcodec.h |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5f3c4b3..efd386a 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -4271,6 +4271,11 @@ int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **op
  * Calling this function on an AVCodecContext that hasn't been opened will free
  * the codec-specific data allocated in avcodec_alloc_context3() with a non-NULL
  * codec. Subsequent calls will do nothing.
+ *
+ * @note Do not use this function. Use avcodec_free_context() to destroy a
+ * codec context (either open or closed). Opening and closing a codec context
+ * multiple times is not supported anymore -- use multiple codec contexts
+ * instead.
  */
 int avcodec_close(AVCodecContext *avctx);
 


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