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