aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2011-02-19 15:22:59 +0100
committerghost <andreas.monzner@multimedia-labs.de>2011-02-19 15:22:59 +0100
commit6d411cf25bf9d283ab220be1d7af72e585af74d2 (patch)
tree52e53d62af135b8734fad10b44919cedcc25fb6b /lib/python
parent5542743a96cff0772577e445a93384d07c291b91 (diff)
downloadenigma2-6d411cf25bf9d283ab220be1d7af72e585af74d2.tar.gz
enigma2-6d411cf25bf9d283ab220be1d7af72e585af74d2.zip
fix merge error (caused by the vob subtitle bug merge)
Diffstat (limited to 'lib/python')
-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..6d1397da 100644
--- 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));
- 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);