Merge commit '69a638019f'
* commit '69a638019f':
avconv: fix -frames for video
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
commit
3005ee372d