From 580e283d07b9bb240686039a963af4b41cbfce30 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Fri, 23 Jun 2006 09:01:42 -0300 Subject: [PATCH] --- yaml --- r: 30025 b: refs/heads/master c: ec675bce403b46570e6ab93eb9a226e966de1010 h: refs/heads/master i: 30023: a3ca924c825d63df7a28a17dd88d868fc21511cc v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-core/dvb_demux.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7d832e2395ca..24c64fc6c08d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c18cb01ca139716a39f4fb92286b6096e8b3f968 +refs/heads/master: ec675bce403b46570e6ab93eb9a226e966de1010 diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_demux.c b/trunk/drivers/media/dvb/dvb-core/dvb_demux.c index 83ec5e06c482..fcff5eab21a3 100644 --- a/trunk/drivers/media/dvb/dvb-core/dvb_demux.c +++ b/trunk/drivers/media/dvb/dvb-core/dvb_demux.c @@ -473,7 +473,7 @@ void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count) goto bailout; } memcpy(&demux->tsbuf[i], buf, j); - if ((demux->tsbuf[0] == 0x47) | (demux->tsbuf[0] == 0xB8)) { + if ((demux->tsbuf[0] == 0x47) || (demux->tsbuf[0] == 0xB8)) { memcpy(tmppack, demux->tsbuf, 188); if (tmppack[0] == 0xB8) tmppack[0] = 0x47; @@ -484,7 +484,7 @@ void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count) } while (p < count) { - if ((buf[p] == 0x47) | (buf[p] == 0xB8)) { + if ((buf[p] == 0x47) || (buf[p] == 0xB8)) { if (count - p >= 204) { memcpy(tmppack, &buf[p], 188); if (tmppack[0] == 0xB8)