OSDN Git Service

Merge remote-tracking branch 'lukaszmluki/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Dec 2013 20:10:59 +0000 (21:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Dec 2013 20:11:03 +0000 (21:11 +0100)
commit12fc0c89dc6b4f092b14f297f29dfd73fe31fecf
tree756d72173b81329ea163ea457c2b55e923d13f53
parent828ac6d1b515ce421519a641b23b05127acc06cd
parent8ba77dfbc2e04c6d1070a8ea57f3dbbf477b95a7
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavf/libssh: improve authentication
  lavf/libssh: fix file mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>