diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-01-18 10:01:12 +0200 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-01-18 10:01:12 +0200 |
| commit | cb6e4b4ffd49cdef83c6d025f175cf6a79705fc8 (patch) | |
| tree | 12b50ef5e4cdfa5710b0f4d21b25b19e61e2030f /src/demuxers/demux_mpeg_pes.c | |
| parent | ecbf41ae10616d6e16befe9e47c3979248776dd9 (diff) | |
| parent | 4d1d566f57c427cd8c009dc68fa9e7fcacc31427 (diff) | |
| download | xine-lib-cb6e4b4ffd49cdef83c6d025f175cf6a79705fc8.tar.gz xine-lib-cb6e4b4ffd49cdef83c6d025f175cf6a79705fc8.tar.bz2 | |
Merge from 1.1
--HG--
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
Diffstat (limited to 'src/demuxers/demux_mpeg_pes.c')
| -rw-r--r-- | src/demuxers/demux_mpeg_pes.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 8d1f4b8af..4d53b6d34 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -980,6 +980,7 @@ static int32_t parse_private_stream_1(demux_mpeg_pes_t *this, uint8_t *p, buf_el } else if ((p[0]&0xf0) == 0xa0) { int pcm_offset; +#if 0 int number_of_frame_headers; int first_access_unit_pointer; int audio_frame_number; @@ -987,13 +988,14 @@ static int32_t parse_private_stream_1(demux_mpeg_pes_t *this, uint8_t *p, buf_el int sample_rate; int num_channels; int dynamic_range; - +#endif /* * found in http://members.freemail.absa.co.za/ginggs/dvd/mpeg2_lpcm.txt * appears to be correct. */ track = p[0] & 0x0F; +#if 0 number_of_frame_headers = p[1]; /* unknown = p[2]; */ first_access_unit_pointer = p[3]; @@ -1024,6 +1026,7 @@ static int32_t parse_private_stream_1(demux_mpeg_pes_t *this, uint8_t *p, buf_el case 2: bits_per_sample = 24; break; } dynamic_range = p[6]; +#endif /* send lpcm config byte */ buf->decoder_flags |= BUF_FLAG_SPECIAL; |