Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> (cherry picked from commit e0d124a9209f44a34e812fb26ba581552b55a731) Conflicts: libavformat/libssh.c
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>