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