Merge commit '3cbc7ef3d60b6af3617079f24a4f401d83353003'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 12:37:07 +0000 (13:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 12:37:07 +0000 (13:37 +0100)
* commit '3cbc7ef3d60b6af3617079f24a4f401d83353003':
  qt-faststart: Increase the copy buffer size to 64 KB

Conflicts:
tools/qt-faststart.c

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

Trivial merge