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