From 5420abe07f8973cdfea876d98c5fd330aeadb54b Mon Sep 17 00:00:00 2001
From: nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 14 Nov 2007 22:25:10 +0000
Subject: removed unneeded checks on MP_DVDNAV and DVDNAV_FORMAT_AC3 (we need
 and assume our fork)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25052 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/stream_dvdnav.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'stream/stream_dvdnav.c')

diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index 59053d7621..e6760cbcb4 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -324,7 +324,6 @@ static int control(stream_t *stream, int cmd, void* arg) {
       *((double *)arg) = !ar ? 4.0/3.0 : 16.0/9.0;
       return 1;
     }
-#ifdef MP_DVDNAV
     case STREAM_CTRL_GET_CURRENT_TIME:
     {
       double tm;
@@ -343,7 +342,6 @@ static int control(stream_t *stream, int cmd, void* arg) {
         return 1;
       break;
     }
-#endif
   }
 
   return STREAM_UNSUPPORTED;
@@ -498,7 +496,6 @@ int dvdnav_aid_from_lang(stream_t *stream, unsigned char *language) {
   uint8_t format, lg;
   uint16_t lang, lcode;;
 
-#ifdef DVDNAV_FORMAT_AC3
   //this macro is defined only in libdvdnav-cvs
   while(language && strlen(language)>=2) {
     lcode = (language[0] << 8) | (language[1]);
@@ -525,7 +522,6 @@ int dvdnav_aid_from_lang(stream_t *stream, unsigned char *language) {
     language += 2;
     while(language[0]==',' || language[0]==' ') ++language;
   }
-#endif
   return -1;
 }
 
-- 
cgit v1.2.3