summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Hintukainen <phintuka@users.sourceforge.net>2011-11-23 15:44:36 +0200
committerPetri Hintukainen <phintuka@users.sourceforge.net>2011-11-23 15:44:36 +0200
commit705c67e259db0f0302850d1a999df07c71a35342 (patch)
tree189702fc582c14d4892841e59a6bc004a168656e
parent3cbd1d53f8528030f55449d44c6125f14239eb9e (diff)
downloadxine-lib-705c67e259db0f0302850d1a999df07c71a35342.tar.gz
xine-lib-705c67e259db0f0302850d1a999df07c71a35342.tar.bz2
demux_ts: simplify pes buffering
-rw-r--r--src/demuxers/demux_ts.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index 3984fe412..089d37619 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -1281,9 +1281,6 @@ static void demux_ts_buffer_pes(demux_ts_t*this, unsigned char *ts,
ts += pes_header_len;
len -= pes_header_len;
- memcpy(m->buf->mem, ts, len);
- m->buf->size = len;
-
update_extra_info(this, m);
/* rate estimation */
@@ -1292,8 +1289,9 @@ static void demux_ts_buffer_pes(demux_ts_t*this, unsigned char *ts,
if (m->pid == this->tbre_pid)
demux_ts_tbre_update (this, TBRE_MODE_AUDIO_PTS, m->pts);
}
+ }
- } else if (!m->corrupted_pes) { /* no pus -- PES packet continuation */
+ if (!m->corrupted_pes) {
if ((m->buf->size + len) > MAX_PES_BUF_SIZE) {
demux_ts_send_buffer(m, 0);