Merge commit '5fa255b65c7887cc913f097aed1b581fbf1a8745'
authorJames Almer <jamrial@gmail.com>
Wed, 28 Sep 2016 15:57:58 +0000 (12:57 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 28 Sep 2016 15:57:58 +0000 (12:57 -0300)
* 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@gmail.com>

Trivial merge