diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-11 19:26:18 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-11 19:26:22 +0100 |
| commit | 75a1fc0376cc89410ff4379e03d94c03fe68a5b8 (patch) | |
| tree | ab9bd00fe31d81ef5fdb717bfe62e43662c96f22 | |
| parent | ec1d8abfb9bf91b84d0d3a89b6f62b4bdefab301 (diff) | |
| parent | 9d4d9be538faa537440fff37d3b7ecf322911a55 (diff) | |
| download | ffmpeg-75a1fc0376cc89410ff4379e03d94c03fe68a5b8.tar.gz | |
Merge commit '9d4d9be538faa537440fff37d3b7ecf322911a55'
* commit '9d4d9be538faa537440fff37d3b7ecf322911a55':
libavcodec: Document that encoders may use the framerate field in AVCodecContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavcodec/avcodec.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3813a0a48e..97b21281f8 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; |