aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2011-02-19 15:20:42 +0100
committerghost <andreas.monzner@multimedia-labs.de>2011-02-19 15:20:42 +0100
commit42f5a704c8bd14f9bac30b61a76effaededc74e8 (patch)
tree3bee2ad924685743adfc06f447fafafe461e9b34 /lib
parentcd6f5da9a8ca77bfceeefe10f332aab3bb3e3de7 (diff)
downloadenigma2-42f5a704c8bd14f9bac30b61a76effaededc74e8.tar.gz
enigma2-42f5a704c8bd14f9bac30b61a76effaededc74e8.zip
servicedvd.cpp: fix merge error (caused by the vob subtitle bug merge)
Diffstat (limited to 'lib')
-rw-r--r--lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
index ccacf3c0..a3749ff7 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
@@ -901,7 +901,7 @@ PyObject *eServiceDVD::getCutList()
ePyObject list = PyList_New(1);
ePyObject tuple = PyTuple_New(2);
PyTuple_SetItem(tuple, 0, PyLong_FromLongLong(m_cue_pts));
- PyTuple_SetItem(tuple, 1, PyInt_FromLong(3));
+ PyTuple_SetItem(tuple, 1, PyInt_FromLong(5));
PyList_SetItem(list, 0, tuple);
return list;
}