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

With some adpation to 2.0 branch
Signed-off-by: KO Myung-Hun <komh@chollian.net>