(cherry picked from commit 02a7f81f74280114c783f75903109e96c1b60173)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>