Merge commit 'a3483f79933e8f1fd99d524e3218688e14c59150'
authorClément Bœsch <cboesch@gopro.com>
Fri, 31 Mar 2017 08:46:06 +0000 (10:46 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 31 Mar 2017 08:46:06 +0000 (10:46 +0200)
* commit 'a3483f79933e8f1fd99d524e3218688e14c59150':
  avconv: Drop stray leftover debug output

This commit is a noop, see a283665693e1c9804b2736545dba77d0ee342f9e

Merged-by: Clément Bœsch <cboesch@gopro.com>

Trivial merge