[FFmpeg-cvslog] Merge commit '3cbc7ef3d60b6af3617079f24a4f401d83353003'

Michael Niedermayer git at videolan.org
Sat Mar 1 13:46:03 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  1 13:37:07 2014 +0100| [eea2cd23e91ab930631d66e8ade401ece705802e] | committer: Michael Niedermayer

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 at gmx.at>

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





More information about the ffmpeg-cvslog mailing list