Merge from 1.1; resync translation files.

--HG--
rename : po/libxine1.pot => po/libxine2.pot
rename : src/libmad/xine_mad_decoder.c => src/audio_dec/xine_mad_decoder.c
rename : src/libspucmml/xine_cmml_decoder.c => src/spu_dec/cmml_decoder.c

1 files changed, 6 insertions, 5 deletions

diff --git a/src/spu_dec/cmml_decoder.c b/src/spu_dec/cmml_decoder.c
index 912e1aed3..53d5fa9ea 100644
--- a/src/spu_dec/cmml_decoder.c
+++ b/src/spu_dec/cmml_decoder.c
@@ -331,9 +331,9 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) {
   /* how many lines does the anchor text take up? */
   this->lines=0;
   {
-    int i = 0;
-    while (*anchor_text) {
-      if (*anchor_text == '\r' || *anchor_text == '\n') {
+    int i = 0, index = 0;
+    while (anchor_text[index]) {
+      if (anchor_text[index] == '\r' || anchor_text[index] == '\n') {
         if (i) {
           /* match a newline and there are chars on the current line ... */
           this->text[ this->lines ][i] = '\0';
@@ -342,11 +342,11 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) {
         }
       } else {
         /* found a normal (non-line-ending) character */
-        this->text[ this->lines ][i] = *anchor_text;
+        this->text[ this->lines ][i] = anchor_text[index];
         if (i<SUB_BUFSIZE-1)
           i++;
       }
-      anchor_text++;
+      index++;
     }
 
     /* always NULL-terminate the string */
@@ -355,6 +355,7 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) {
       this->lines++;
     }
   }
+  free (anchor_text);
 
   /* initialize decoder if needed */
   if( !this->cached_width || !this->cached_height || !this->cached_img_duration || !this->osd ) {