Merge commit '9d4d9be538faa537440fff37d3b7ecf322911a55'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-05-11 19:26:18 +01:00
commit 75a1fc0376

View File

@ -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;