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