OSDN Git Service

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)
commitdf2ae8f3f0a8ce9d9aefa5efb664928a783759ec
tree45da019b69aabaf47bc6ca7fc2efaceca65db3bb
parent83bf40f3cfcf4b7545e41836b37f21806004f136
parent5fa255b65c7887cc913f097aed1b581fbf1a8745
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@gmail.com>