diff -up MPlayer-1.0rc2/stream/stream_dvd.h.dvdread MPlayer-1.0rc2/stream/stream_dvd.h
--- MPlayer-1.0rc2/stream/stream_dvd.h.dvdread	2007-10-07 21:49:26.000000000 +0200
+++ MPlayer-1.0rc2/stream/stream_dvd.h	2007-11-22 20:21:10.000000000 +0100
@@ -3,11 +3,6 @@
 #include "dvdread/ifo_types.h"
 #include "dvdread/ifo_read.h"
 #include "dvdread/nav_read.h"
-#elif defined(USE_DVDNAV)
-#include <dvd_reader.h>
-#include <ifo_types.h>
-#include <ifo_read.h>
-#include <nav_read.h>
 #else
 #include <dvdread/dvd_reader.h>
 #include <dvdread/ifo_types.h>
diff -up MPlayer-1.0rc2/stream/stream_dvd.c.dvdread MPlayer-1.0rc2/stream/stream_dvd.c
--- MPlayer-1.0rc2/stream/stream_dvd.c.dvdread	2007-10-07 21:49:26.000000000 +0200
+++ MPlayer-1.0rc2/stream/stream_dvd.c	2007-11-22 20:28:59.000000000 +0100
@@ -928,11 +928,7 @@ static int open_s(stream_t *stream,int m
       if(vts_file->vts_pgcit) {
         int i;
         for(i=0;i<8;i++)
-#ifdef USE_DVDREAD_INTERNAL
           if(pgc->audio_control[i].present) {
-#else
-          if(pgc->audio_control[i] & 0x8000) {
-#endif
             audio_attr_t * audio = &vts_file->vtsi_mat->vts_audio_attr[i];
             int language = 0;
             char tmp[] = "unknown";
@@ -946,11 +942,7 @@ static int open_s(stream_t *stream,int m
             }
 
             audio_stream->language=language;
-#ifdef USE_DVDREAD_INTERNAL
             audio_stream->id=pgc->audio_control[i].s_audio;
-#else
-            audio_stream->id=pgc->audio_control[i] >> 8 & 7;
-#endif
             switch(audio->audio_format) {
               case 0: // ac3
                 audio_stream->id+=FIRST_AC3_AID;
@@ -997,11 +989,7 @@ static int open_s(stream_t *stream,int m
 
       d->nr_of_subtitles=0;
       for(i=0;i<32;i++)
-#ifdef USE_DVDREAD_INTERNAL
       if(pgc->subp_control[i].present) {
-#else
-      if(pgc->subp_control[i] & 0x80000000) {
-#endif
         subp_attr_t * subtitle = &vts_file->vtsi_mat->vts_subp_attr[i];
         video_attr_t *video = &vts_file->vtsi_mat->vts_video_attr;
         int language = 0;
@@ -1018,17 +1006,9 @@ static int open_s(stream_t *stream,int m
         sub_stream->language=language;
         sub_stream->id=d->nr_of_subtitles;
         if(video->display_aspect_ratio == 0) /* 4:3 */
-#ifdef USE_DVDREAD_INTERNAL
           sub_stream->id = pgc->subp_control[i].s_4p3;
-#else
-          sub_stream->id = pgc->subp_control[i] >> 24 & 31;
-#endif
         else if(video->display_aspect_ratio == 3) /* 16:9 */
-#ifdef USE_DVDREAD_INTERNAL
           sub_stream->id = pgc->subp_control[i].s_lbox;
-#else
-          sub_stream->id = pgc->subp_control[i] >> 8 & 31;
-#endif
 
         mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDsubtitleLanguage, sub_stream->id, tmp);
         mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sub_stream->id);