[FFmpeg-cvslog] Merge remote-tracking branch 'lukaszmluki/master'

Michael Niedermayer git at videolan.org
Wed Jan 22 01:35:28 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 22 01:12:18 2014 +0100| [94a52417cb23c1de8fa6829399d8fc61a0078a8e] | committer: Michael Niedermayer

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

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





More information about the ffmpeg-cvslog mailing list