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