(cherry picked from commit 16c88b6d8f8cdeff0df833abd1e094991e34a137)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>