diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-12-28 00:00:02 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-12-28 00:00:02 +0000 |
| commit | 77d2945bb960d4d90bdb1fe85889a2e41a160bd4 (patch) | |
| tree | a697c4f5d614aafa87b8b435c7541db7d0fbcd6d /src/demuxers | |
| parent | 7716f3ae5d537addf193961cc2a8041364f7f10c (diff) | |
| parent | 953615d01307263853aab6130bce1fc9d816ca34 (diff) | |
| download | xine-lib-77d2945bb960d4d90bdb1fe85889a2e41a160bd4.tar.gz xine-lib-77d2945bb960d4d90bdb1fe85889a2e41a160bd4.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/combined/demux_flac.c => src/combined/flac_demuxer.c
rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_mpeg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 39d4a575d..2c47a71a0 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -330,7 +330,7 @@ static void parse_mpeg2_packet (demux_mpeg_t *this, int stream_id, int64_t scr) if((this->dummy_space[0] & 0xf0) == 0x80) { /* read rest of header - AC3 */ - i = this->input->read (this->input, this->dummy_space+1, 3); + this->input->read (this->input, this->dummy_space+1, 3); /* contents */ for (i = len - 4; i > 0; i -= (this->audio_fifo) @@ -431,7 +431,7 @@ static void parse_mpeg2_packet (demux_mpeg_t *this, int stream_id, int64_t scr) header_len -= 5 ; } - i = this->input->read (this->input, this->dummy_space, header_len); + this->input->read (this->input, this->dummy_space, header_len); for (i = len; i > 0; i -= (this->audio_fifo) ? this->audio_fifo->buffer_pool_buf_size : this->video_fifo->buffer_pool_buf_size) { @@ -503,7 +503,7 @@ static void parse_mpeg2_packet (demux_mpeg_t *this, int stream_id, int64_t scr) } /* read rest of header */ - i = this->input->read (this->input, this->dummy_space, header_len); + this->input->read (this->input, this->dummy_space, header_len); /* contents */ |