(cherry picked from commit 64188f7809f44b9b74f94e07bbd0381b398a6afa)
Signed-off-by: Ilkka Ollakka <ileoo@iki.fi>
(cherry picked from commit 5fd7ef49)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>