[FFmpeg-cvslog] Merge commit '7a5f4f6853047eea74a6443d73f4d74d52b2799f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 18 14:20:09 2014 +0200| [8636b11bdc6ecd7c486d3463a7dcb22b0c0a9ba7] | committer: Michael Niedermayer

Merge commit '7a5f4f6853047eea74a6443d73f4d74d52b2799f'

* commit '7a5f4f6853047eea74a6443d73f4d74d52b2799f':
  lavf: extend avg_frame_rate documentation.

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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