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