This reverts commit c9a36881.

Conflicts:

	contrib/src/dvbpsi/rules.mak
(cherry picked from commit aa2748bd)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>