From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 1 Mar 2014 12:37:07 +0000 (+0100)
Subject: Merge commit '3cbc7ef3d60b6af3617079f24a4f401d83353003'
X-Git-Tag: android-x86-6.0-r1~6922
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eea2cd23e91ab930631d66e8ade401ece705802e;p=android-x86%2Fexternal-ffmpeg.git

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

eea2cd23e91ab930631d66e8ade401ece705802e