(cherry picked from commit 3e954c9811e72ef7486be92723bb96f7e5b4af06)
(cherry picked from commit 0f82e032376e3d03f11530745ca4047195d3ba2c)
(cherry picked from commit f559e33ca77317b9c43630bdaf5484ef419fb757)
(cherry picked from commit 67b2f035a8e602c266c9b20f0a48ab8f399b538b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>