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