[FFmpeg-cvslog] Merge commit 'fa8934d6d6a0bb290010bdf16265c40b331d56fb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 10 01:24:36 2014 +0100| [1397cb002d9d17f1f0abcfa98823678c172d32af] | committer: Michael Niedermayer

Merge commit 'fa8934d6d6a0bb290010bdf16265c40b331d56fb'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1397cb002d9d17f1f0abcfa98823678c172d32af
---