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)
commiteea2cd23e91ab930631d66e8ade401ece705802e
tree21043354b5ed88733649eb2b63c664911a3dc415
parenta22907e9ea7f89f268cd38071fbacad6c394e80b
parent3cbc7ef3d60b6af3617079f24a4f401d83353003
Merge commit '3cbc7ef3d60b6af3617079f24a4f401d83353003'

* 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>