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