diff -Naur MPlayer-0.90.orig/libmenu/Makefile MPlayer-0.90/libmenu/Makefile
--- MPlayer-0.90.orig/libmenu/Makefile	2003-04-29 21:57:38.000000000 +0200
+++ MPlayer-0.90/libmenu/Makefile	2003-06-29 23:48:14.000000000 +0200
@@ -3,7 +3,7 @@
 
 LIBNAME = libmenu.a
 
-SRCS= menu.c vf_menu.c menu_cmdlist.c menu_pt.c menu_list.c menu_filesel.c menu_txt.c menu_console.c menu_param.c
+SRCS= menu.c vf_menu.c menu_cmdlist.c menu_pt.c menu_list.c menu_filesel.c menu_audiosel.c menu_subsel.c menu_txt.c menu_console.c menu_param.c
 OBJS=$(SRCS:.c=.o)
 
 CFLAGS  = $(OPTFLAGS) -I. -I.. -I../libmpcodecs $(EXTRA_INC) -Wall
diff -Naur MPlayer-0.90.orig/libmenu/menu_audiosel.c MPlayer-0.90/libmenu/menu_audiosel.c
--- MPlayer-0.90.orig/libmenu/menu_audiosel.c	1970-01-01 01:00:00.000000000 +0100
+++ MPlayer-0.90/libmenu/menu_audiosel.c	2003-06-29 23:48:14.000000000 +0200
@@ -0,0 +1,132 @@
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../config.h"
+
+#include "../m_struct.h"
+#include "../m_option.h"
+#include "../input/input.h"
+
+#include "../libmpdemux/stream.h"
+#include "../libmpdemux/demuxer.h"
+
+#include "img_format.h"
+#include "mp_image.h"
+
+#include "menu.h"
+#include "menu_list.h"
+
+
+struct list_entry_s {
+  struct list_entry p;
+  int aid;
+};
+
+struct menu_priv_s {
+  menu_list_priv_t p;
+  char* title;
+  int auto_close;
+};
+
+static struct menu_priv_s cfg_dflt = {
+  MENU_LIST_PRIV_DFLT,
+  "Select audio channel",
+  0
+};
+
+#define ST_OFF(m) M_ST_OFF(struct menu_priv_s,m)
+
+static m_option_t cfg_fields[] = {
+  MENU_LIST_PRIV_FIELDS,
+  { "title", ST_OFF(title),  CONF_TYPE_STRING, 0, 0, 0, NULL },
+  { "auto-close", ST_OFF(auto_close), CONF_TYPE_FLAG, 0, 0, 1, NULL },
+  { NULL, NULL, NULL, 0,0,0,NULL }
+};
+
+
+extern stream_t* stream;
+extern demuxer_t *demuxer;
+extern void resync_audio_stream(void *sh_audio);
+extern char *dvd_lang_from_aid(stream_t *stream, int aid);
+
+static int fill_menu(menu_t* menu) {
+  char *str, aid_str[32];
+  list_entry_t* e;
+  int aid;
+
+  if (!demuxer || !demuxer->audio || !demuxer->audio->sh){
+    menu_list_read_cmd(menu,MENU_CMD_CANCEL);
+    return 1;
+  }
+
+  menu_list_init(menu);
+
+  for (aid=0; aid<MAX_A_STREAMS; aid++)
+    if (demuxer->a_streams[aid]){
+      if (stream->type == STREAMTYPE_DVD){
+        if (!(str = dvd_lang_from_aid(stream, aid)))
+          continue;
+        strcpy (aid_str, str);
+      } else
+        sprintf(aid_str, "%d", aid);
+      if((e = calloc(1,sizeof(list_entry_t))) != NULL){
+        e->p.next = NULL;
+        e->p.txt = strdup(aid_str);
+        e->aid = aid;
+        menu_list_add_entry(menu,e);
+      }
+    }
+
+  return 1;
+}
+
+static void read_cmd(menu_t* menu,int cmd) {
+  int aid;
+
+  switch(cmd) {
+  case MENU_CMD_OK:
+    aid = menu->priv->p.current->aid;
+    if (demuxer->audio->id != aid){
+      demuxer->audio->id = aid;
+      if(demuxer->audio->sh)
+        resync_audio_stream(demuxer->audio->sh);
+    }
+    if(menu->priv->auto_close)
+      mp_input_queue_cmd(mp_input_parse_cmd("menu hide"));
+    break;
+  default:
+    menu_list_read_cmd(menu,cmd);
+  }
+}
+
+static void close_as(menu_t* menu) {
+  menu_list_uninit(menu,NULL);
+}
+
+static int open_as(menu_t* menu, char* args) {
+  args = NULL;
+
+  menu->draw = menu_list_draw;
+  menu->read_cmd = read_cmd;
+  menu->read_key = menu_dflt_read_key;
+  menu->close = close_as;
+  menu->priv->p.title = menu->priv->title;
+
+  return fill_menu(menu);
+}
+  
+const menu_info_t menu_info_audiosel = {
+  "Audio seletor menu",
+  "audiosel",
+  "aurel.j",
+  "",
+  {
+    "audiosel_cfg",
+    sizeof(struct menu_priv_s),
+    &cfg_dflt,
+    cfg_fields
+  },
+  open_as
+};
diff -Naur MPlayer-0.90.orig/libmenu/menu.c MPlayer-0.90/libmenu/menu.c
--- MPlayer-0.90.orig/libmenu/menu.c	2003-04-29 21:57:38.000000000 +0200
+++ MPlayer-0.90/libmenu/menu.c	2003-06-29 23:48:14.000000000 +0200
@@ -22,6 +22,8 @@
 extern menu_info_t menu_info_cmdlist;
 extern menu_info_t menu_info_pt;
 extern menu_info_t menu_info_filesel;
+extern menu_info_t menu_info_audiosel;
+extern menu_info_t menu_info_subsel;
 extern menu_info_t menu_info_txt;
 extern menu_info_t menu_info_console;
 extern menu_info_t menu_info_pref;
@@ -30,6 +32,8 @@
   &menu_info_pt,
   &menu_info_cmdlist,
   &menu_info_filesel,
+  &menu_info_audiosel,
+  &menu_info_subsel,
   &menu_info_txt,
   &menu_info_console,
   &menu_info_pref,
diff -Naur MPlayer-0.90.orig/libmenu/menu_subsel.c MPlayer-0.90/libmenu/menu_subsel.c
--- MPlayer-0.90.orig/libmenu/menu_subsel.c	1970-01-01 01:00:00.000000000 +0100
+++ MPlayer-0.90/libmenu/menu_subsel.c	2003-06-29 23:52:20.000000000 +0200
@@ -0,0 +1,144 @@
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../config.h"
+
+#include "../m_struct.h"
+#include "../m_option.h"
+#include "../input/input.h"
+
+#include "../libmpdemux/stream.h"
+#include "../libmpdemux/demuxer.h"
+#include "../libvo/video_out.h"
+#include "../libvo/sub.h"
+#include "../spudec.h"
+#include "../mplayer.h"
+
+#include "img_format.h"
+#include "mp_image.h"
+
+#include "menu.h"
+#include "menu_list.h"
+
+
+struct list_entry_s {
+  struct list_entry p;
+  int sid;
+};
+
+struct menu_priv_s {
+  menu_list_priv_t p;
+  char* title;
+  int auto_close;
+};
+
+static struct menu_priv_s cfg_dflt = {
+  MENU_LIST_PRIV_DFLT,
+  "Select subtitle",
+  0
+};
+
+#define ST_OFF(m) M_ST_OFF(struct menu_priv_s,m)
+
+static m_option_t cfg_fields[] = {
+  MENU_LIST_PRIV_FIELDS,
+  { "title", ST_OFF(title),  CONF_TYPE_STRING, 0, 0, 0, NULL },
+  { "auto-close", ST_OFF(auto_close), CONF_TYPE_FLAG, 0, 0, 1, NULL },
+  { NULL, NULL, NULL, 0,0,0,NULL }
+};
+
+
+extern stream_t* stream;
+extern demuxer_t *demuxer;
+extern char *dvd_lang_from_sid(stream_t *stream, int sid);
+
+static int fill_menu(menu_t* menu) {
+  list_entry_t* e;
+  char *lang;
+  int sid = 0;
+
+  if ((demuxer && demuxer->sub && stream->type == STREAMTYPE_DVD)
+      || set_of_sub_size > 0){
+    menu_list_init(menu);
+
+    if(stream->type == STREAMTYPE_DVD){
+      while((lang = dvd_lang_from_sid(stream, sid)))
+        if((e = calloc(1,sizeof(list_entry_t))) != NULL){
+          e->p.next = NULL;
+          e->p.txt = strdup(lang);
+          e->sid = sid++;
+          menu_list_add_entry(menu,e);
+        }
+    } else {
+      while(sid < set_of_sub_size)
+        if((e = calloc(1,sizeof(list_entry_t))) != NULL){
+          e->p.txt = strrchr(set_of_subtitles[sid]->filename, '/');
+          if(e->p.txt == NULL)  e->p.txt = set_of_subtitles[sid]->filename;
+          else  e->p.txt++;
+          e->p.next = NULL;
+          e->sid = sid++;
+          menu_list_add_entry(menu,e);
+        }
+    }
+  } else {
+    menu_list_read_cmd(menu,MENU_CMD_CANCEL);
+  }
+
+  return 1;
+}
+
+static void read_cmd(menu_t* menu,int cmd) {
+  int sid;
+
+  switch(cmd) {
+  case MENU_CMD_OK:
+    sid = menu->priv->p.current->sid;
+    if(stream->type == STREAMTYPE_DVD && demuxer->sub->id != sid){
+      demuxer->sub->id = sid;
+      if(vo_spudec)
+        spudec_reset(vo_spudec);
+    } else if(set_of_sub_pos != sid) {
+      set_of_sub_pos = sid;
+      subdata = set_of_subtitles[set_of_sub_pos];
+      vo_sub = NULL;
+      vo_osd_changed(OSDTYPE_SUBTITLE);
+    }
+    if(menu->priv->auto_close)
+      mp_input_queue_cmd(mp_input_parse_cmd("menu hide"));
+    break;
+  default:
+    menu_list_read_cmd(menu,cmd);
+  }
+}
+
+static void close_ss(menu_t* menu) {
+  menu_list_uninit(menu,NULL);
+}
+
+static int open_ss(menu_t* menu, char* args) {
+  args = NULL;
+
+  menu->draw = menu_list_draw;
+  menu->read_cmd = read_cmd;
+  menu->read_key = menu_dflt_read_key;
+  menu->close = close_ss;
+  menu->priv->p.title = menu->priv->title;
+
+  return fill_menu(menu);
+}
+  
+const menu_info_t menu_info_subsel = {
+  "Subtitle seletor menu",
+  "subsel",
+  "aurel.j",
+  "",
+  {
+    "subsel_cfg",
+    sizeof(struct menu_priv_s),
+    &cfg_dflt,
+    cfg_fields
+  },
+  open_ss
+};
diff -Naur MPlayer-0.90.orig/libmpdemux/open.c MPlayer-0.90/libmpdemux/open.c
--- MPlayer-0.90.orig/libmpdemux/open.c	2003-04-29 21:57:38.000000000 +0200
+++ MPlayer-0.90/libmpdemux/open.c	2003-06-29 23:48:14.000000000 +0200
@@ -664,6 +664,19 @@
   return -1;
 }
 
+char *dvd_lang_from_aid(stream_t *stream, int aid){
+static char desc[32];
+dvd_priv_t *d=stream->priv;
+int i;
+  for(i=0;i<d->nr_of_channels;i++){
+    if(d->audio_streams[i].id==aid){
+      sprintf (desc, "%c%c - %s (%s)", (d->audio_streams[i].language>>8)&0xFF, d->audio_streams[i].language&0xFF, dvd_audio_stream_types[d->audio_streams[i].type], dvd_audio_stream_channels[d->audio_streams[i].channels]);
+      return desc;
+    }
+  }
+  return NULL;
+}
+
 int dvd_sid_from_lang(stream_t *stream, unsigned char* lang){
 dvd_priv_t *d=stream->priv;
 int code,i;
@@ -682,6 +695,17 @@
   return -1;
 }
 
+char *dvd_lang_from_sid(stream_t *stream, int sid){
+dvd_priv_t *d=stream->priv;
+static char lang[3];
+  if (sid >= d->nr_of_subtitles)
+    return NULL;
+  lang[0] = d->subtitles[sid].language>>8;
+  lang[1] = d->subtitles[sid].language;
+  lang[2] = '\0';
+  return lang;
+}
+
 static int dvd_next_cell(dvd_priv_t *d){
     int next_cell=d->cur_cell;
 
diff -Naur MPlayer-0.90.orig/mplayer.c MPlayer-0.90/mplayer.c
--- MPlayer-0.90.orig/mplayer.c	2003-04-29 21:57:38.000000000 +0200
+++ MPlayer-0.90/mplayer.c	2003-06-29 23:48:14.000000000 +0200
@@ -277,8 +277,8 @@
 float sub_last_pts = -303;
 #endif
 
-static stream_t* stream=NULL;
-static demuxer_t *demuxer=NULL;
+stream_t* stream=NULL;
+demuxer_t *demuxer=NULL;
 static sh_audio_t *sh_audio=NULL;
 static sh_video_t *sh_video=NULL;
 
@@ -1428,7 +1428,7 @@
 demux_info_print(demuxer);
 
 //================== Read SUBTITLES (DVD & TEXT) ==========================
-if(d_dvdsub->id >= 0 && vo_spudec==NULL && sh_video){
+if(vo_spudec==NULL && sh_video){
 
 if (spudec_ifo) {
   unsigned int palette[16], width, height;
