 +      if (dvdsub_id != sh->sid) return 0;
 +    }
 +  }
++#endif
 +
    /// Clear subtitles if necessary (for broken files)
    if (sub_clear_text(&ogg_sub, pts)) {
      vo_sub = &ogg_sub;
-@@ -754,6 +797,7 @@
+@@ -754,6 +799,7 @@
    ogg_packet pack;
    sh_audio_t* sh_a;
    sh_video_t* sh_v;

 .B \-dumpsrtsub (MPlayer only)
 Convert the given subtitle (specified with the \-sub option) to the time-based
 SubViewer (SRT) subtitle format.
diff -ruN -x 'config.*' -x configure.log -x '*.o' -x allformats.c -x vidix -x codecs.conf.h -x version.h -x help_mp.h mplayer-svn/DOCS/man/es/mplayer.1 mplayer-svn-with-kate/DOCS/man/es/mplayer.1
--- mplayer-svn/DOCS/man/es/mplayer.1	2008-03-14 13:26:40.000000000 +0000
+++ mplayer-svn-with-kate/DOCS/man/es/mplayer.1	2008-03-15 21:25:48.000000000 +0000
@@ -183,8 +183,8 @@
 subttulos grandes y bonitos con suavizado de bordes y realimentacin visual de
 los controles con teclado.

 </itemizedlist>
 </para>
  
diff -ruN -x 'config.*' -x configure.log -x '*.o' -x allformats.c -x vidix -x codecs.conf.h -x version.h -x help_mp.h -x '*.d' mplayer/DOCS/xml/ru/usage.xml mplayer-with-kate/DOCS/xml/ru/usage.xml
--- mplayer/DOCS/xml/ru/usage.xml	2008-06-21 11:16:12.000000000 +0100
+++ mplayer-with-kate/DOCS/xml/ru/usage.xml	2008-06-21 11:18:30.000000000 +0100
@@ -121,6 +121,7 @@
   <listitem><para>CC (closed caption[скрытые титры])</para></listitem>
   <listitem><para>MicroDVD</para></listitem>
