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