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)
commitadc489adc97faf959f955933d198659f6227adb5
treed94ccb713264f90ad6048bfab85ef7fb85807fca
parente3287077ecff33bd02227b85ec760fe47d796f54
parenta3483f79933e8f1fd99d524e3218688e14c59150
Merge commit 'a3483f79933e8f1fd99d524e3218688e14c59150'

* commit 'a3483f79933e8f1fd99d524e3218688e14c59150':
  avconv: Drop stray leftover debug output

This commit is a noop, see a283665693e1c9804b2736545dba77d0ee342f9e

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