Commit 8636b11b authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7a5f4f68'

* commit '7a5f4f68':
  lavf: extend avg_frame_rate documentation.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4f32efdf 7a5f4f68
...@@ -835,6 +835,10 @@ typedef struct AVStream { ...@@ -835,6 +835,10 @@ typedef struct AVStream {
/** /**
* Average framerate * Average framerate
*
* - demuxing: May be set by libavformat when creating the stream or in
* avformat_find_stream_info().
* - muxing: May be set by the caller before avformat_write_header().
*/ */
AVRational avg_frame_rate; AVRational avg_frame_rate;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment