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