From bfcd158cbdc8d487c18aaaba706d05500dbfc007 Mon Sep 17 00:00:00 2001 From: Holger Waechtler Date: Thu, 17 Oct 2002 16:18:56 +0000 Subject: fix scripting errors --- linux/drivers/media/dvb/dvb-core/dvb_filter.c | 4 ++-- linux/drivers/media/dvb/dvb-core/dvb_filter.h | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'linux/drivers/media/dvb/dvb-core') diff --git a/linux/drivers/media/dvb/dvb-core/dvb_filter.c b/linux/drivers/media/dvb/dvb-core/dvb_filter.c index 2a0f86e9b..c52d1462f 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_filter.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_filter.c @@ -454,7 +454,7 @@ int dvb_filter_instant_repack(u8 *buf, int count, ipack *p) send_ipack(p); dvb_filter_ipack_reset(p); if (c < count) - dvb_filter_dvb_filter_instant_repack(buf+c, count-c, p); + dvb_filter_instant_repack(buf+c, count-c, p); } } return count; @@ -495,7 +495,7 @@ void ts_to_pes(ipack *p, u8 *buf) // don't need count (=188) off = buf[4] + 1; if (off+4 > 187) return; } - dvb_filter_dvb_filter_instant_repack(buf+4+off, TS_SIZE-4-off, p); + dvb_filter_instant_repack(buf+4+off, TS_SIZE-4-off, p); } /* needs 5 byte input, returns picture coding type*/ diff --git a/linux/drivers/media/dvb/dvb-core/dvb_filter.h b/linux/drivers/media/dvb/dvb-core/dvb_filter.h index c8140a4dd..b084112fa 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_filter.h +++ b/linux/drivers/media/dvb/dvb-core/dvb_filter.h @@ -6,18 +6,18 @@ #include "demux.h" -typedef int (dvb_filter_dvb_filter_pes2ts_cb_t) (void *, unsigned char *); +typedef int (dvb_filter_pes2ts_cb_t) (void *, unsigned char *); -typedef struct dvb_filter_dvb_filter_pes2ts_s { +typedef struct dvb_filter_pes2ts_s { unsigned char buf[188]; unsigned char cc; - dvb_filter_dvb_filter_pes2ts_cb_t *cb; + dvb_filter_pes2ts_cb_t *cb; void *priv; -} dvb_filter_dvb_filter_pes2ts_t; +} dvb_filter_pes2ts_t; -void dvb_filter_dvb_filter_pes2ts_init(dvb_filter_dvb_filter_pes2ts_t *p2ts, unsigned short pid, - dvb_filter_dvb_filter_pes2ts_cb_t *cb, void *priv); -int dvb_filter_dvb_filter_pes2ts(dvb_filter_dvb_filter_pes2ts_t *p2ts, unsigned char *pes, int len); +void dvb_filter_pes2ts_init(dvb_filter_pes2ts_t *p2ts, unsigned short pid, + dvb_filter_pes2ts_cb_t *cb, void *priv); +int dvb_filter_pes2ts(dvb_filter_pes2ts_t *p2ts, unsigned char *pes, int len); #define PROG_STREAM_MAP 0xBC @@ -225,7 +225,7 @@ typedef struct audio_i{ void dvb_filter_ipack_reset(ipack *p); -int dvb_filter_dvb_filter_instant_repack(u8 *buf, int count, ipack *p); +int dvb_filter_instant_repack(u8 *buf, int count, ipack *p); void dvb_filter_ipack_init(ipack *p, int size, void (*func)(u8 *buf, int size, void *priv)); void dvb_filter_ipack_free(ipack * p); -- cgit v1.2.3