From: ghost Date: Sat, 19 Feb 2011 14:20:42 +0000 (+0100) Subject: servicedvd.cpp: fix merge error (caused by the vob subtitle bug merge) X-Git-Tag: experimental-2011.03~1^2~1^2~4 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/42f5a704c8bd14f9bac30b61a76effaededc74e8 servicedvd.cpp: fix merge error (caused by the vob subtitle bug merge) --- 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; }