(cherry picked from commit 72c35564542f44a42c3c977ddeb99864bde6839b)
(cherry picked from commit 9457b4e1444438a7953bdb75567f2b7051db422d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>