Less hacks and tabs in this version
(cherry picked from commit a0f0e09d553708704d00b7145df9c706bd09d380)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>