diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-03 22:03:58 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-03 22:03:58 +0000 |
commit | 0384045e300ab8b93251c7b3b962bdb1697a5b9c (patch) | |
tree | 98bbb9709661416436bbff7e27c638bb822770ef /stream/stream_dvd.c | |
parent | 630302ad63e98fcdd96509c91a3c92ed03af9cbb (diff) | |
download | mpv-0384045e300ab8b93251c7b3b962bdb1697a5b9c.tar.bz2 mpv-0384045e300ab8b93251c7b3b962bdb1697a5b9c.tar.xz |
Streamline and simplify internal vs external libdvdread handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20651 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/stream_dvd.c')
-rw-r--r-- | stream/stream_dvd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index e20bb78f33..6a183a24e4 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -742,7 +742,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { if(vts_file->vts_pgcit) { int i; for(i=0;i<8;i++) -#ifdef USE_MPDVDKIT +#ifdef USE_DVDREAD_INTERNAL if(vts_file->vts_pgcit->pgci_srp[ttn].pgc->audio_control[i].present) { #else if(vts_file->vts_pgcit->pgci_srp[ttn].pgc->audio_control[i] & 0x8000) { @@ -759,7 +759,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { } d->audio_streams[d->nr_of_channels].language=language; -#ifdef USE_MPDVDKIT +#ifdef USE_DVDREAD_INTERNAL d->audio_streams[d->nr_of_channels].id=vts_file->vts_pgcit->pgci_srp[ttn].pgc->audio_control[i].s_audio; #else d->audio_streams[d->nr_of_channels].id=vts_file->vts_pgcit->pgci_srp[ttn].pgc->audio_control[i] >> 8 & 7; @@ -810,7 +810,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { d->nr_of_subtitles=0; for(i=0;i<32;i++) -#ifdef USE_MPDVDKIT +#ifdef USE_DVDREAD_INTERNAL if(vts_file->vts_pgcit->pgci_srp[ttn].pgc->subp_control[i].present) { #else if(vts_file->vts_pgcit->pgci_srp[ttn].pgc->subp_control[i] & 0x80000000) { @@ -830,13 +830,13 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { d->subtitles[ d->nr_of_subtitles ].language=language; d->subtitles[ d->nr_of_subtitles ].id=d->nr_of_subtitles; if(video->display_aspect_ratio == 0) /* 4:3 */ -#ifdef USE_MPDVDKIT +#ifdef USE_DVDREAD_INTERNAL d->subtitles[d->nr_of_subtitles].id = vts_file->vts_pgcit->pgci_srp[ttn].pgc->subp_control[i].s_4p3; #else d->subtitles[d->nr_of_subtitles].id = vts_file->vts_pgcit->pgci_srp[ttn].pgc->subp_control[i] >> 24 & 31; #endif else if(video->display_aspect_ratio == 3) /* 16:9 */ -#ifdef USE_MPDVDKIT +#ifdef USE_DVDREAD_INTERNAL d->subtitles[d->nr_of_subtitles].id = vts_file->vts_pgcit->pgci_srp[ttn].pgc->subp_control[i].s_lbox; #else d->subtitles[d->nr_of_subtitles].id = vts_file->vts_pgcit->pgci_srp[ttn].pgc->subp_control[i] >> 8 & 31; |