merge lib/dvb