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