Merge branch 'bug_124_m2ts_support'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 16 Feb 2011 13:31:31 +0000 (14:31 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 16 Feb 2011 13:31:31 +0000 (14:31 +0100)
commitdec9693d8437a31dab8e4010b33b57e1476a315c
treef4877973363fee5c1b381f83bd1fd51d1cc472ce
parentcdb8a973f09efb2d42875d7854edba9a411719ff
parent266b7db4f7e4a369206551e62df43e9a29edbeff
Merge branch 'bug_124_m2ts_support'

Conflicts:
lib/dvb/pmt.cpp
lib/service/Makefile.am
lib/dvb/esection.h
lib/dvb/pmt.cpp
lib/dvb/pmt.h
lib/dvb/tstools.cpp
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
lib/service/Makefile.am
lib/service/servicedvb.cpp