Loosely cherry-picked from f036b8a5d97db53d5c7e47736ab3d43aeb7520e8
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>