Fix a trivial conflict, where the location of DVB headers
got moved.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>