(cherry picked from commit 21e4928a6b98fd7b6bb520b5f1b863738a695295)
(cherry picked from commit 3e7cc6f5762510082bc4e7301ad9a4ed2bb6de77)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>