[FFmpeg-cvslog] Merge commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Mar 22 15:50:37 2017 +0100| [97c17cafab4ecf6df70de4ce19ada325d5b585c3] | committer: Clément Bœsch

Merge commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6'

* commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6':
  avconv: set the encoding framerate when the output is CFR

This commit is a noop, see 8db301deadfcf113fb274881e65afcbe3e1bd645

Merged-by: Clément Bœsch <u at pkh.me>

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