Mercurial > mplayer.hg

changeset 25024:1c630d8331af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed unneeded checks on MP_DVDNAV and DVDNAV_FORMAT_AC3 (we need and assume our fork)
author nicodvb
date Wed, 14 Nov 2007 22:25:10 +0000
parents 03d7f478c367
children ff136e30da72
files stream/stream_dvdnav.c
diffstat 1 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/stream/stream_dvdnav.c	Wed Nov 14 22:21:04 2007 +0000
+++ b/stream/stream_dvdnav.c	Wed Nov 14 22:25:10 2007 +0000
@@ -324,7 +324,6 @@
       *((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 @@
         return 1;
       break;
     }
-#endif
   }
 
   return STREAM_UNSUPPORTED;
@@ -498,7 +496,6 @@
   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 @@
     language += 2;
     while(language[0]==',' || language[0]==' ') ++language;
   }
-#endif
   return -1;
 }