(cherry picked from commit b85cc5537812613a2988651c851b08fa34b7516a)

Close #7040
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>