From 2b00fb6cedea5e6a72777210eb20bc34a7a3893b Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Fri, 25 Nov 2011 12:28:20 +0200
Subject: demux_ts: fixed DEMUX_OPTIONAL_DATA_SPULANG when language is unknown

--HG--
branch : point-release
---
 src/demuxers/demux_ts.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index ed1f789ba..b6f11c91f 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -2360,10 +2360,14 @@ static int demux_ts_get_optional_data(demux_plugin_t *this_gen,
 
     case DEMUX_OPTIONAL_DATA_SPULANG:
       if (channel>=0 && channel<this->spu_langs_count) {
-        memcpy(str, this->spu_langs[channel].desc.lang, 3);
-	str[3] = 0;}
-      else
+        if (this->spu_langs[channel].desc.lang[0]) {
+          strcpy(str, this->spu_langs[channel].desc.lang);
+        } else {
+          sprintf(str, "%3i", channel);
+        }
+      } else {
         strcpy(str, "none");
+      }
       return DEMUX_OPTIONAL_SUCCESS;
 
     default:
-- 
cgit v1.2.3