Should close #6570
(cherry picked from commit 7f807d9bb7cb08f1401d5cbec472338ed1d38157)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>