Manually backported from af4805700c96f17972ab6d3292404f9248be2b90
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>