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