Merge commit 'fa8934d6d6a0bb290010bdf16265c40b331d56fb'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Dec 2014 00:24:36 +0000 (01:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Dec 2014 00:24:56 +0000 (01:24 +0100)
commit1397cb002d9d17f1f0abcfa98823678c172d32af
treebe628ee8b6f34df72d09c944df21f0f63685a08e
parentbd378acad4e4865879bee0862c685e7f56ec91a9
parentfa8934d6d6a0bb290010bdf16265c40b331d56fb
Merge commit 'fa8934d6d6a0bb290010bdf16265c40b331d56fb'

* commit 'fa8934d6d6a0bb290010bdf16265c40b331d56fb':
  dashenc: log file output progress in verbose mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/dashenc.c