diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-04-22 21:30:10 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-04-22 21:30:10 +0000 |
| commit | ab15c33b1270d290b551b528308480f73284dd11 (patch) | |
| tree | 20caf841c5810be3edcb04faafc1f7e70c330cf0 | |
| parent | 12c57c557c0901744178ef1190a8aa120f83e335 (diff) | |
| download | xine-lib-ab15c33b1270d290b551b528308480f73284dd11.tar.gz xine-lib-ab15c33b1270d290b551b528308480f73284dd11.tar.bz2 | |
it seems that mux rate was wrong for all mpeg2 demuxers.
(somebody please double check)
CVS patchset: 6425
CVS date: 2004/04/22 21:30:10
| -rw-r--r-- | src/demuxers/demux_mpeg.c | 4 | ||||
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 4 | ||||
| -rw-r--r-- | src/demuxers/demux_mpeg_pes.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index b9d2ac18d..fdb9b7b7f 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_mpeg.c,v 1.136 2004/04/09 16:07:10 miguelfreitas Exp $ + * $Id: demux_mpeg.c,v 1.137 2004/04/22 21:30:10 miguelfreitas Exp $ * * demultiplexer for mpeg 1/2 program streams * reads streams of variable blocksizes @@ -733,8 +733,8 @@ static uint32_t parse_pack(demux_mpeg_t *this) { this->rate = (buf << 14); buf = read_bytes (this, 1); this->rate |= (buf << 6); + buf = read_bytes (this, 1); this->rate |= (buf >> 2); - read_bytes (this, 1); } else { read_bytes(this,3); } diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 576fade87..cd9de325a 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpeg_block.c,v 1.205 2004/01/12 17:35:15 miguelfreitas Exp $ + * $Id: demux_mpeg_block.c,v 1.206 2004/04/22 21:30:10 miguelfreitas Exp $ * * demultiplexer for mpeg 1/2 program streams * used with fixed blocksize devices (like dvd/vcd) @@ -465,7 +465,7 @@ static int32_t parse_program_stream_pack_header(demux_mpeg_block_t *this, uint8_ if (!this->rate) { this->rate = (p[0xA] << 14); this->rate |= (p[0xB] << 6); - this->rate |= (p[0xB] >> 2); + this->rate |= (p[0xC] >> 2); } num_stuffing_bytes = p[0xD] & 0x07; diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index a7148495d..ec36ecfb7 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpeg_pes.c,v 1.20 2004/01/12 17:35:15 miguelfreitas Exp $ + * $Id: demux_mpeg_pes.c,v 1.21 2004/04/22 21:30:10 miguelfreitas Exp $ * * demultiplexer for mpeg 2 PES (Packetized Elementary Streams) * reads streams of variable blocksizes @@ -482,7 +482,7 @@ static int32_t parse_program_stream_pack_header(demux_mpeg_pes_t *this, uint8_t if (!this->rate) { this->rate = (p[0xA] << 14); this->rate |= (p[0xB] << 6); - this->rate |= (p[0xB] >> 2); + this->rate |= (p[0xC] >> 2); } i = this->input->read (this->input, buf->mem+12, (off_t) 2); if (i != 2) { |