lib/libdvbsub: simplify
Merge remote-tracking branch 'martiis-neutrino-mp/master'

Conflicts:
	lib/libdvbsub/dvbsub.cpp