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 ccacf3c062fac10bed2a730245e44d532360749a..6d1397da4d5e538741c62554ac5fa46cc7b5503d 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
@@ -749,7 +749,7 @@ PyObject *eServiceDVD::getSubtitleList()
                ePyObject tuple = PyTuple_New(5);
                PyTuple_SetItem(tuple, 0, PyInt_FromLong(2));
                PyTuple_SetItem(tuple, 1, PyInt_FromLong(spu_id+1));
                ePyObject tuple = PyTuple_New(5);
                PyTuple_SetItem(tuple, 0, PyInt_FromLong(2));
                PyTuple_SetItem(tuple, 1, PyInt_FromLong(spu_id+1));

-               PyTuple_SetItem(tuple, 2, PyInt_FromLong(3));
+               PyTuple_SetItem(tuple, 2, PyInt_FromLong(5));

                PyTuple_SetItem(tuple, 3, PyInt_FromLong(0));
                PyTuple_SetItem(tuple, 4, PyString_FromString(spu_string));
                PyList_Append(l, tuple);
                PyTuple_SetItem(tuple, 3, PyInt_FromLong(0));
                PyTuple_SetItem(tuple, 4, PyString_FromString(spu_string));
                PyList_Append(l, tuple);