Merge branch 'bug_537_ignore_vob_pgs_subtitles' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Sat, 19 Feb 2011 12:17:35 +0000 (13:17 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Sat, 19 Feb 2011 12:17:35 +0000 (13:17 +0100)
commit8e3b33ff38bd7c006351b1921ac8f3d1606de39f
treeb72a70ac7c23a4193382d07d4bd861dfa3b10f52
parent47eb827c45c6c8637418b64480d518d8553e4ee9
parentf2381d07785eb22548298f3b3b268c986ab1c882
Merge branch 'bug_537_ignore_vob_pgs_subtitles' into experimental
lib/service/servicemp3.cpp
lib/service/servicemp3.h