Important code changes were done by Orange
(cherry picked from commit be96451c)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>