This reverts commit 3cb4988a.

Conflicts:

	modules/demux/playlist/dvb.c
(cherry picked from commit 805ddb47)