From: ghost <andreas.monzner@multimedia-labs.de>
Date: Sat, 19 Feb 2011 14:22:59 +0000 (+0100)
Subject: fix merge error (caused by the vob subtitle bug merge)
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=6d411cf25bf9d283ab220be1d7af72e585af74d2

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 ccacf3c..6d1397d 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);