Changeset e8e91a32 in ffmpeg

Timestamp:

Feb 28, 2014, 1:14:22 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

669043db

Parents:

5c634cbe (diff), 9f4b55ef (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (02/28/14 01:14:17)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/28/14 01:14:22)

Message:

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>

(No files)