Ref #7431 #5377
(cherry picked from commit a2df1797f9b6b39fcb8eeb3f0d616e9713b065c5)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>