(cherry picked from commit 3339c90e94805f80007a14c40d70980011e8640e)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>