[FFmpeg-cvslog] Merge commit '9d4d9be538faa537440fff37d3b7ecf322911a55'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed May 11 19:26:18 2016 +0100| [75a1fc0376cc89410ff4379e03d94c03fe68a5b8] | committer: Derek Buitenhuis

Merge commit '9d4d9be538faa537440fff37d3b7ecf322911a55'

* commit '9d4d9be538faa537440fff37d3b7ecf322911a55':
  libavcodec: Document that encoders may use the framerate field in AVCodecContext

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

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

 libavcodec/avcodec.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 3813a0a..97b2128 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3323,7 +3323,8 @@ typedef struct AVCodecContext {
      * - decoding: For codecs that store a framerate value in the compressed
      *             bitstream, the decoder may export it here. { 0, 1} when
      *             unknown.
-     * - encoding: unused
+     * - encoding: May be used to signal the framerate of CFR content to an
+     *             encoder.
      */
     AVRational framerate;
 


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