Merge from 1.1.

2 files changed, 6 insertions, 5 deletions

diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index 549c19b02..c271fc6fc 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.c
@@ -253,6 +253,7 @@ static void *audio_decoder_loop (void *stream_gen) {
 	
 	uint32_t audio_type = 0;
 	int      i,j;
+	uint32_t chan=buf->type&0x0000FFFF;
 
 	/*
         printf("audio_decoder: buf_type=%08x auto=%08x user=%08x\n",
@@ -264,11 +265,11 @@ static void *audio_decoder_loop (void *stream_gen) {
         /* update track map */
         
         i = 0;
-        while ( (i<stream->audio_track_map_entries) && (stream->audio_track_map[i]<buf->type) ) 
+        while ( (i<stream->audio_track_map_entries) && ((stream->audio_track_map[i]&0x0000FFFF)<chan) ) 
           i++;
         
         if ( (i==stream->audio_track_map_entries) 
-	     || (stream->audio_track_map[i] != buf->type) ) {
+	     || ((stream->audio_track_map[i]&0x0000FFFF)!=chan) ) {
           xine_event_t  ui_event;
 
           j = stream->audio_track_map_entries;
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 67c8ef909..cc3f21db8 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -353,9 +353,9 @@ static void config_remove(config_values_t *this, cfg_entry_t *entry, cfg_entry_t
 static const char *config_xlate_internal (const char *key, const xine_config_entry_translation_t *trans)
 {
   --trans;
-  while ((++trans)->old)
-    if (trans->new[0] && strcmp(key, trans->old) == 0)
-      return trans->new;
+  while ((++trans)->old_name)
+    if (trans->new_name[0] && strcmp(key, trans->old_name) == 0)
+      return trans->new_name;
   return NULL;
 }