diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-03 14:29:01 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-03 14:29:01 +0000 |
| commit | 21f2437d9beea8b2a5e6234d278c92c7be397d9c (patch) | |
| tree | c755b2ee8f97e3fa7aca1d36704f892574e55a3d /libmpdvdkit2/ifo_read.c | |
| parent | 6b95575c06e6b593b18ebaf4bd7ca3610c368c18 (diff) | |
| download | mpv-21f2437d9beea8b2a5e6234d278c92c7be397d9c.tar.bz2 mpv-21f2437d9beea8b2a5e6234d278c92c7be397d9c.tar.xz | |
Fix DVD audio and subtitle stream mapping, esp. for DVD with both 4:3 and
16:9 subtitles.
Patch by Lehel Bernadt (lehel at pmc-services hu) with minor modifications.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16650 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdvdkit2/ifo_read.c')
| -rw-r--r-- | libmpdvdkit2/ifo_read.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libmpdvdkit2/ifo_read.c b/libmpdvdkit2/ifo_read.c index 60ce748199..ef308b52e0 100644 --- a/libmpdvdkit2/ifo_read.c +++ b/libmpdvdkit2/ifo_read.c @@ -638,10 +638,6 @@ static int ifoRead_PGC(ifo_handle_t *ifofile, pgc_t *pgc, unsigned int offset) { B2N_16(pgc->cell_playback_offset); B2N_16(pgc->cell_position_offset); - for(i = 0; i < 8; i++) - B2N_16(pgc->audio_control[i]); - for(i = 0; i < 32; i++) - B2N_32(pgc->subp_control[i]); for(i = 0; i < 16; i++) B2N_32(pgc->palette[i]); @@ -650,10 +646,10 @@ static int ifoRead_PGC(ifo_handle_t *ifofile, pgc_t *pgc, unsigned int offset) { /* verify time (look at print_time) */ for(i = 0; i < 8; i++) - if(!pgc->audio_control[i] & 0x8000) /* The 'is present' bit */ + if(!pgc->audio_control[i].present) CHECK_ZERO(pgc->audio_control[i]); for(i = 0; i < 32; i++) - if(!pgc->subp_control[i] & 0x80000000) /* The 'is present' bit */ + if(!pgc->subp_control[i].present) CHECK_ZERO(pgc->subp_control[i]); /* Check that time is 0:0:0:0 also if nr_of_programs == 0 */ |