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)
commit8636b11bdc6ecd7c486d3463a7dcb22b0c0a9ba7
treee5209c73967382e04ed3967f51d1edc6b519b228
parent4f32efdff007024869ab2755c9223c159ace4442
parent7a5f4f6853047eea74a6443d73f4d74d52b2799f
Merge commit '7a5f4f6853047eea74a6443d73f4d74d52b2799f'

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

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