Merge remote-tracking branch 'lukaszmluki/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 01:14:17 +0000 (02:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 01:14:22 +0000 (02:14 +0100)
commite8e91a32e5ce3f7bc57634597684da8dcb334aec
treeb60a45aa0a52d550f1753d3ecae161cef4d81f83
parent5c634cbeb7b463e00ae2f2fa225a15b5b94c27be
parent9f4b55ef49c1525080507f5eaeef91091d243e16
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavf/ftp: fix seek to nagative position
  lavf/libssh: fix seek to nagative position

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