diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-14 22:25:10 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-14 22:25:10 +0000 |
| commit | 5420abe07f8973cdfea876d98c5fd330aeadb54b (patch) | |
| tree | f9da326cb3a167d43c789761438aae4c40d691f5 /stream | |
| parent | d4267c41659c85daff08fb372ed5726296f07bd9 (diff) | |
| download | mpv-5420abe07f8973cdfea876d98c5fd330aeadb54b.tar.bz2 mpv-5420abe07f8973cdfea876d98c5fd330aeadb54b.tar.xz | |
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
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/stream_dvdnav.c | 4 |
1 files changed, 0 insertions, 4 deletions
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; } |