* commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628': avconv: fix -frames for video Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>