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