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)
* lukaszmluki/master:
  lavf/ftp: fix seek to nagative position
  lavf/libssh: fix seek to nagative position

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

Trivial merge