[FFmpeg-cvslog] Merge commit '5fa255b65c7887cc913f097aed1b581fbf1a8745'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Sep 28 12:57:58 2016 -0300| [df2ae8f3f0a8ce9d9aefa5efb664928a783759ec] | committer: James Almer

Merge commit '5fa255b65c7887cc913f097aed1b581fbf1a8745'

* commit '5fa255b65c7887cc913f097aed1b581fbf1a8745':
  avconv: initialize output framerate earlier

Skipping this for now. It's not needed until several committs ahead,
and should be carefully implemented.

Merged-by: James Almer <jamrial at gmail.com>

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