Merge commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-05-08 22:50:42 +01:00
commit 3005ee372d

Diff Content Not Available