diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-31 18:37:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-31 19:26:19 +0200 |
| commit | f70d0212ce13347395eb5643bab9fba4dd8e2ee3 (patch) | |
| tree | 86e01478e20a3acb293d1e59fae5b02abce90c3a /libavformat/nutenc.c | |
| parent | 6e073dd127f09f203bd21d40a1eb423afd183e7a (diff) | |
| parent | ddbcc48b646737c8bff7f8e28e0a69dca65509cf (diff) | |
| download | ffmpeg-f70d0212ce13347395eb5643bab9fba4dd8e2ee3.tar.gz | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
ftp: enhanced error handling
ftp: reconnect on seek
ftp: move common commands code to function
ftp: enhanced status code handling
ftp: reconnect on read
ftp: move create control connection to function
ftp: credentials moved into FTPContext
ftp: rename function name
ftp: formatting and typos fixes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutenc.c')
0 files changed, 0 insertions, 0 deletions