Merge branch 'bug_124_m2ts_support' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 26 Nov 2010 14:02:25 +0000 (15:02 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 26 Nov 2010 14:02:25 +0000 (15:02 +0100)
commitd98f00f0fdd8b95b819b17c1d4779610c657c198
treed23a9c8007eff9e0c268befe8f930f458ac2981a
parentc4a0d51174feca310d0c45cc34be3c910a306228
parent070b9256befecb72bbdc7052aef61e5f2f0b9515
Merge branch 'bug_124_m2ts_support' into experimental

Conflicts:
lib/dvb/pmt.cpp
lib/service/Makefile.am
lib/dvb/pmt.cpp
lib/dvb/pmt.h
lib/dvb/tstools.cpp
lib/service/Makefile.am
lib/service/servicedvb.cpp