Merge commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:50:42 +0000 (22:50 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:50:46 +0000 (22:50 +0100)
commit3005ee372d470243fbcaf03e6104a46dcb4e8c2e
treecfd14d6e1004644dcec785914835998063afa07a
parent939345854a9e8ab32e88b9c9c99c8772049fb965
parent69a638019fc0db4c2b75b36ef45d0acb6d2e9628
Merge commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628'

* commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628':
  avconv: fix -frames for video

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>