[MPlayer-cvslog] CVS: main mplayer.c,1.881,1.882

[Tobias Diedrich CVS]

CVS change done by Tobias Diedrich CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv30116

Modified Files:
	mplayer.c 
Log Message:
Translated strings might be longer than the originals.  One unnecessary dependancy on string length fixed; quadrupled buffer size for matroska case

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.881
retrieving revision 1.882
diff -u -r1.881 -r1.882
--- mplayer.c	5 Nov 2005 01:27:38 -0000	1.881
+++ mplayer.c	5 Nov 2005 17:25:34 -0000	1.882
@@ -4147,24 +4147,23 @@
 #ifdef USE_DVDREAD
 	  if (vo_spudec && (demuxer->type != DEMUXER_TYPE_MATROSKA)) {
 	      if (dvdsub_id >= 0) {
-		  char lang[5] = MSGTR_OSDnone;
+		  char lang[3] = "\0\0\0";
 		  int code = 0;
 		  code = dvd_lang_from_sid(stream, dvdsub_id);
 		  if (code) {
 		      lang[0] = code >> 8;
 		      lang[1] = code;
-		      lang[2] = 0;
 		  }
-		  snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesLanguage, dvdsub_id, lang);
+		  snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesLanguage, dvdsub_id, code ? lang : MSGTR_OSDnone);
 	      }
 	  }
 #endif
 #ifdef HAVE_MATROSKA
     if (demuxer->type == DEMUXER_TYPE_MATROSKA) {
-      char lang[10] = MSGTR_OSDunknown;
+      char lang[40] = MSGTR_OSDunknown;
       if (dvdsub_id >= 0) {
-        demux_mkv_get_sub_lang(demuxer, dvdsub_id, lang, 9);
-        lang[9] = 0;
+        demux_mkv_get_sub_lang(demuxer, dvdsub_id, lang, 39);
+        lang[39] = 0;
 	snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesLanguage, dvdsub_id, lang);
       }
     }