servicedvd.cpp: fix merge error (caused by the vob subtitle bug merge)
authorghost <andreas.monzner@multimedia-labs.de>
Sat, 19 Feb 2011 14:20:42 +0000 (15:20 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Sat, 19 Feb 2011 14:20:42 +0000 (15:20 +0100)
commit42f5a704c8bd14f9bac30b61a76effaededc74e8
tree3bee2ad924685743adfc06f447fafafe461e9b34
parentcd6f5da9a8ca77bfceeefe10f332aab3bb3e3de7
servicedvd.cpp: fix merge error (caused by the vob subtitle bug merge)
lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp