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