diff options
| author | phintuka <phintuka> | 2011-08-01 12:21:02 +0000 |
|---|---|---|
| committer | phintuka <phintuka> | 2011-08-01 12:21:02 +0000 |
| commit | a2a28757ea621f5088d3366b37a687aac3ed8a0d (patch) | |
| tree | daa4c298d22f3ab5fd01a9822444b0a6671bc0ad | |
| parent | 4758beec2333589dd3fd5fc17403bae3ae16556a (diff) | |
| download | xineliboutput-a2a28757ea621f5088d3366b37a687aac3ed8a0d.tar.gz xineliboutput-a2a28757ea621f5088d3366b37a687aac3ed8a0d.tar.bz2 | |
parse_pes_header(): eliminated local variable by simplifying the code
that skips pes header
| -rw-r--r-- | xine/BluRay/demux_ts.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/xine/BluRay/demux_ts.c b/xine/BluRay/demux_ts.c index 8500cfb1..12c11469 100644 --- a/xine/BluRay/demux_ts.c +++ b/xine/BluRay/demux_ts.c @@ -751,7 +751,6 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, int header_len; int64_t pts; uint32_t stream_id; - int pkt_len; if (packet_len < 9) { xprintf (xine, XINE_VERBOSITY_DEBUG, @@ -760,7 +759,6 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, } p = buf; - pkt_len = packet_len; /* we should have a PES packet here */ @@ -770,13 +768,12 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, return 0 ; } - packet_len -= 6; /* packet_len = p[4] << 8 | p[5]; */ stream_id = p[3]; header_len = p[8]; /* sometimes corruption on header_len causes segfault in memcpy below */ - if (header_len + 9 > pkt_len) { + if (header_len + 9 > packet_len) { xprintf (xine, XINE_VERBOSITY_DEBUG, "demux_ts: illegal value for PES_header_data_length (0x%x)\n", header_len); return 0; @@ -818,7 +815,7 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, m->pts = pts; p += header_len + 9; - packet_len -= header_len + 3; + packet_len -= header_len + 9; if (m->descriptor_tag == STREAM_VIDEO_VC1) { m->content = p; |