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