Edited patch to apply to master, original is here:
http://mailman.videolan.org/pipermail/vlc-devel/2009-June/061076.html

Original-by: Nicolas Chauvet
Signed-off-by: Daniel Mierswa <impulze@impulze.org>
Signed-off-by: Rafaël Carré <rafael.carre@gmail.com>