Merge commit '1db8eb154908cde577477b6ab17430a0cd46b7bd'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:04:47 +0000 (23:04 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:04:53 +0000 (23:04 +0100)
commit9109b5240b5e93abee0957dd5b054057e556c571
tree9d48b6cb97d28e9fb0c1b27c081060f00a3d1b08
parentdc0152548f03ec83a48d5419143d14fd7878b8f3
parent1db8eb154908cde577477b6ab17430a0cd46b7bd
Merge commit '1db8eb154908cde577477b6ab17430a0cd46b7bd'

* commit '1db8eb154908cde577477b6ab17430a0cd46b7bd':
  avconv: Drop an unused variable

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