This is partially cherry picked from commit f7ee3edcc510959cb85ffde3c350df8c36123c4e
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>