diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-22 01:12:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-22 01:12:23 +0100 |
| commit | 94a52417cb23c1de8fa6829399d8fc61a0078a8e (patch) | |
| tree | 683ecdd843f2018fb372ecbc829c5f17379688ea /libswresample/swresampleres.rc | |
| parent | 28bc1d94b739d8273caad49641f8335240972cbf (diff) | |
| parent | 9ef441c5255340c24ebd2cbc133ed487c4542840 (diff) | |
| download | ffmpeg-94a52417cb23c1de8fa6829399d8fc61a0078a8e.tar.gz | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavf/ftp: remove double space
lavf/libssh: fix seek with whence==SEEK_CUR
lavf/libssh: rename context variable from s into libssh
lavf/libssh: add av_cold attributes
lavf/libssh: factorize create_sftp_session function
lavf/libssh: factorize create_ssh_session function
lavf/libssh: factorize file_stat function
lavf/libssh: factorize open_file function
lavf/libssh: add private_key option
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresampleres.rc')
0 files changed, 0 insertions, 0 deletions