oops, wrong directory...

2 files changed, 25 insertions, 10 deletions

diff --git a/linux/drivers/media/dvb/dvb-core/dvb_filter.c b/linux/drivers/media/dvb/dvb-core/dvb_filter.c
index d73e27c64..2a0f86e9b 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_filter.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_filter.c
@@ -24,8 +24,8 @@ uint32_t ac3_frames[3][32] =
 
 
 
-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)
+void dvb_filter_pes2ts_init(dvb_filter_pes2ts_t *p2ts, unsigned short pid, 
+			    dvb_filter_pes2ts_cb_t *cb, void *priv)
 {
 	unsigned char *buf=p2ts->buf;
 
@@ -37,7 +37,7 @@ void dvb_filter_dvb_filter_pes2ts_init(dvb_filter_dvb_filter_pes2ts_t *p2ts, uns
 	p2ts->priv=priv;
 }
 
-int dvb_filter_dvb_filter_pes2ts(dvb_filter_dvb_filter_pes2ts_t *p2ts, unsigned char *pes, int len)
+int dvb_filter_pes2ts(dvb_filter_pes2ts_t *p2ts, unsigned char *pes, int len)
 {
 	unsigned char *buf=p2ts->buf;
 	int ret=0, rest;
@@ -99,6 +99,7 @@ void dvb_filter_ipack_free(ipack * p)
 	if (p->buf) vfree(p->buf);
 }
 
+static
 void send_ipack(ipack *p)
 {
 	int off;
@@ -178,7 +179,8 @@ void dvb_filter_ipack_flush(ipack *p)
 	dvb_filter_ipack_reset(p);
 }
 
-static void write_ipack(ipack *p, u8 *data, int count)
+static 
+void write_ipack(ipack *p, u8 *data, int count)
 {
 	u8 headr[3] = { 0x00, 0x00, 0x01} ;
 
@@ -200,7 +202,7 @@ static void write_ipack(ipack *p, u8 *data, int count)
 	}
 }
 
-int dvb_filter_dvb_filter_instant_repack(u8 *buf, int count, ipack *p)
+int dvb_filter_instant_repack(u8 *buf, int count, ipack *p)
 {
 	int l;
 	int c=0;
@@ -459,7 +461,7 @@ int dvb_filter_dvb_filter_instant_repack(u8 *buf, int count, ipack *p)
 }
 
 
-
+static
 void setup_ts2pes(ipack *pa, ipack *pv, u16 *pida, u16 *pidv, 
 		  void (*pes_write)(u8 *buf, int count, void *data),
 		  void *priv)
@@ -472,6 +474,7 @@ void setup_ts2pes(ipack *pa, ipack *pv, u16 *pida, u16 *pidv,
 	pv->data = priv;
 }
 
+static
 void ts_to_pes(ipack *p, u8 *buf) // don't need count (=188)
 {
 	u8 off = 0;
@@ -496,6 +499,7 @@ void ts_to_pes(ipack *p, u8 *buf) // don't need count (=188)
 }
 
 /* needs 5 byte input, returns picture coding type*/
+static
 int read_picture_header(uint8_t *headr, mpg_picture *pic, int field, int pr)
 {
 	uint8_t pct;
@@ -541,6 +545,7 @@ int read_picture_header(uint8_t *headr, mpg_picture *pic, int field, int pr)
 
 
 /* needs 4 byte input */
+static
 int read_gop_header(uint8_t *headr, mpg_picture *pic, int pr)
 {
 	if (pr) printk("GOP header: "); 
@@ -570,6 +575,7 @@ int read_gop_header(uint8_t *headr, mpg_picture *pic, int pr)
 }
 
 /* needs 8 byte input */
+static
 int read_sequence_header(uint8_t *headr, VideoInfo *vi, int pr)
 {
         int sw;
@@ -681,6 +687,7 @@ int read_sequence_header(uint8_t *headr, VideoInfo *vi, int pr)
 	return 0;
 }
 
+static
 int get_vinfo(uint8_t *mbuf, int count, VideoInfo *vi, int pr)
 {
 	uint8_t *headr;
@@ -707,6 +714,7 @@ int get_vinfo(uint8_t *mbuf, int count, VideoInfo *vi, int pr)
 	return 0;
 }
 
+static
 int get_ainfo(uint8_t *mbuf, int count, AudioInfo *ai, int pr)
 {
 	uint8_t *headr;
@@ -760,6 +768,7 @@ int get_ainfo(uint8_t *mbuf, int count, AudioInfo *ai, int pr)
 	return 0;
 }
 
+static
 int get_ac3info(uint8_t *mbuf, int count, AudioInfo *ai, int pr)
 {
 	uint8_t *headr;
@@ -809,6 +818,8 @@ int get_ac3info(uint8_t *mbuf, int count, AudioInfo *ai, int pr)
 	return 0;
 }
 
+
+static
 uint8_t *skip_pes_header(uint8_t **bufp)
 {
         uint8_t *inbuf = *bufp;
@@ -816,7 +827,7 @@ uint8_t *skip_pes_header(uint8_t **bufp)
         uint8_t *pts = NULL;
         int skip = 0;
 
-int mpeg1_skip_table[16] = {
+static const int mpeg1_skip_table[16] = {
         1, 0xffff,      5,     10, 0xffff, 0xffff, 0xffff, 0xffff,
         0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
 };
@@ -846,6 +857,7 @@ int mpeg1_skip_table[16] = {
 }
 
 
+static
 void initialize_quant_matrix( uint32_t *matrix )
 {
         int i;
@@ -871,6 +883,7 @@ void initialize_quant_matrix( uint32_t *matrix )
                 matrix[i] = 0x10101010;
 }
 
+static
 void initialize_mpg_picture(mpg_picture *pic)
 {
         int i;
@@ -897,6 +910,7 @@ void initialize_mpg_picture(mpg_picture *pic)
 }
 
 
+static
 void mpg_set_picture_parameter( int32_t field_type, mpg_picture *pic )
 {
         int16_t last_h_offset;
@@ -933,6 +947,7 @@ void mpg_set_picture_parameter( int32_t field_type, mpg_picture *pic )
         }
 }
 
+static
 void init_mpg_picture( mpg_picture *pic, int chan, int32_t field_type)
 {
         pic->picture_header = 0;
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c b/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c
index edbda9adb..a4afdd50c 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c
@@ -43,7 +43,7 @@ EXPORT_SYMBOL(dvb_filter_ipack_init);
 EXPORT_SYMBOL(dvb_filter_ipack_reset);
 EXPORT_SYMBOL(dvb_filter_ipack_free);
 EXPORT_SYMBOL(dvb_filter_ipack_flush);
-EXPORT_SYMBOL(dvb_filter_dvb_filter_instant_repack);
-EXPORT_SYMBOL(dvb_filter_dvb_filter_pes2ts_init);
-EXPORT_SYMBOL(dvb_filter_dvb_filter_pes2ts);
+EXPORT_SYMBOL(dvb_filter_instant_repack);
+EXPORT_SYMBOL(dvb_filter_pes2ts_init);
+EXPORT_SYMBOL(dvb_filter_pes2ts);