Merge commit '7a5f4f6853047eea74a6443d73f4d74d52b2799f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:20:09 +0000 (14:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:27:29 +0000 (14:27 +0200)
* commit '7a5f4f6853047eea74a6443d73f4d74d52b2799f':
  lavf: extend avg_frame_rate documentation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/avformat.h

Simple merge