diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 13:37:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 13:37:07 +0100 |
| commit | eea2cd23e91ab930631d66e8ade401ece705802e (patch) | |
| tree | 21043354b5ed88733649eb2b63c664911a3dc415 /libavformat/ftp.c | |
| parent | a22907e9ea7f89f268cd38071fbacad6c394e80b (diff) | |
| parent | 3cbc7ef3d60b6af3617079f24a4f401d83353003 (diff) | |
| download | ffmpeg-eea2cd23e91ab930631d66e8ade401ece705802e.tar.gz | |
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>
Diffstat (limited to 'libavformat/ftp.c')
0 files changed, 0 insertions, 0 deletions