(cherry picked from commit 6559a56bd9da9e6c7f88e6d99cdd9c5e2a795340)
Signed-off-by: Jean-Paul Saman <jpsaman@videolan.org>