(cherry picked from commit ed810a5693cac334050c06fe453eae44fb6eb868)

Conflicts:
	Makefile.am
Signed-off-by: Rafaël Carré <funman@videolan.org>