This reverts commit 3cb4988a.

Conflicts:

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