s/weißnichwas/durch_weißnichwas/g

2 files changed, 28 insertions, 28 deletions

diff --git a/linux/drivers/media/dvb/av7110/av7110.c b/linux/drivers/media/dvb/av7110/av7110.c
index 17cc22251..e7e536092 100644
--- a/linux/drivers/media/dvb/av7110/av7110.c
+++ b/linux/drivers/media/dvb/av7110/av7110.c
@@ -89,7 +89,7 @@ static int  outcom(av7110_t *av7110, int type, int com, int num, ...);
 static void SetMode(av7110_t *av7110, int mode);
 
 void pes_to_ts(u8 const *buf, long int length, u16 pid, p2t_t *p);
-void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, dvb_demux_feed_t *feed);
+void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, struct dvb_demux_feed *feed);
 
 static u32 vidmem	= 0;
 static u32 vidlow	= 0;
@@ -394,7 +394,7 @@ static int arm_thread(void *data)
 static int
 record_cb(dvb_filter_pes2ts_t *p2t, u8 *buf, size_t len)
 {
-        dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) p2t->priv;
+        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) p2t->priv;
 
         if (!(dvbdmxfeed->ts_type & TS_PACKET)) 
                 return 0;
@@ -410,7 +410,7 @@ record_cb(dvb_filter_pes2ts_t *p2t, u8 *buf, size_t len)
 static int 
 dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
 {
-        dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) priv;
+        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) priv;
         
         dvbdmxfeed->cb.ts(data, 188, 0, 0,
                           &dvbdmxfeed->feed.ts,
@@ -420,9 +420,9 @@ dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
 
 static int 
 AV_StartRecord(av7110_t *av7110, int av,
-               dvb_demux_feed_t *dvbdmxfeed)
+               struct dvb_demux_feed *dvbdmxfeed)
 {
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
   
         if (av7110->playing||(av7110->rec_mode&av))
                 return -EBUSY;
@@ -824,7 +824,7 @@ void CI_handle(av7110_t *av7110, u8 *data, u16 len)
 static inline int
 DvbDmxFilterCallback(u8 * buffer1, size_t buffer1_len,
                      u8 * buffer2, size_t buffer2_len,
-                     dvb_demux_filter_t *dvbdmxfilter,
+                     struct dvb_demux_filter *dvbdmxfilter,
                      dmx_success_t success,
                      av7110_t *av7110)
 {
@@ -2539,7 +2539,7 @@ dvb_aplay(av7110_t *av7110, const u8 *buf,
 	return count-todo;
 }
 
-void init_p2t(p2t_t *p, dvb_demux_feed_t *feed)
+void init_p2t(p2t_t *p, struct dvb_demux_feed *feed)
 {
 	memset(p->pes,0,TS_SIZE);
 	p->counter = 0;
@@ -2735,7 +2735,7 @@ int write_ts_header2(u16 pid, u8 *counter, int pes_start, u8 *buf, u8 length)
 
 
 void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, 
-            dvb_demux_feed_t *feed)
+            struct dvb_demux_feed *feed)
 {
   
 	int l, pes_start;
@@ -3196,9 +3196,9 @@ static inline int vid_unregister(av7110_t *av7110)
  ******************************************************************************/
 
 static int 
-StartHWFilter(dvb_demux_filter_t *dvbdmxfilter)
+StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)
 {
-        dvb_demux_feed_t *dvbdmxfeed=dvbdmxfilter->feed;
+        struct dvb_demux_feed *dvbdmxfeed=dvbdmxfilter->feed;
         av7110_t *av7110=(av7110_t *) dvbdmxfeed->demux->priv;
         u16 buf[20];
         int ret, i;
@@ -3234,7 +3234,7 @@ StartHWFilter(dvb_demux_filter_t *dvbdmxfilter)
 }
 
 static int 
-StopHWFilter(dvb_demux_filter_t *dvbdmxfilter)
+StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
 {
         av7110_t *av7110=(av7110_t *) dvbdmxfilter->feed->demux->priv;
         u16 buf[3];
@@ -3266,9 +3266,9 @@ StopHWFilter(dvb_demux_filter_t *dvbdmxfilter)
 
 
 static int 
-dvb_write_to_decoder(dvb_demux_feed_t *dvbdmxfeed, u8 *buf, size_t count)
+dvb_write_to_decoder(struct dvb_demux_feed *dvbdmxfeed, u8 *buf, size_t count)
 {
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
         av7110_t *av7110=(av7110_t *) dvbdmx->priv;
         ipack *ipack=&av7110->ipack[dvbdmxfeed->pes_type];
 
@@ -3307,9 +3307,9 @@ dvb_write_to_decoder(dvb_demux_feed_t *dvbdmxfeed, u8 *buf, size_t count)
 }
 
 static void
-dvb_feed_start_pid(dvb_demux_feed_t *dvbdmxfeed)
+dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed)
 {
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
         av7110_t *av7110=(av7110_t *) dvbdmx->priv;
         u16 *pid=dvbdmx->pids, npids[5];
         int i;
@@ -3344,9 +3344,9 @@ dvb_feed_start_pid(dvb_demux_feed_t *dvbdmxfeed)
 }
 
 static void
-dvb_feed_stop_pid(dvb_demux_feed_t *dvbdmxfeed)
+dvb_feed_stop_pid(struct dvb_demux_feed *dvbdmxfeed)
 {
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
         av7110_t *av7110=(av7110_t *) dvbdmx->priv;
         u16 *pid=dvbdmx->pids, npids[5];
         int i;
@@ -3380,9 +3380,9 @@ dvb_feed_stop_pid(dvb_demux_feed_t *dvbdmxfeed)
 }
 
 static int 
-dvb_start_feed(dvb_demux_feed_t *dvbdmxfeed)
+dvb_start_feed(struct dvb_demux_feed *dvbdmxfeed)
 {
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
         av7110_t *av7110=(av7110_t *) dvbdmx->priv;
 
         if (!dvbdmx->dmx.frontend)
@@ -3440,9 +3440,9 @@ dvb_start_feed(dvb_demux_feed_t *dvbdmxfeed)
 
 
 static int 
-dvb_stop_feed(dvb_demux_feed_t *dvbdmxfeed)
+dvb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
 {
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
         av7110_t *av7110=(av7110_t *) dvbdmx->priv;
 
         if (av7110->saa->card_type>=DVB_CARD_TT_BUDGET) 
@@ -3483,8 +3483,8 @@ dvb_stop_feed(dvb_demux_feed_t *dvbdmxfeed)
 static void 
 restart_feeds(av7110_t *av7110)
 {
-        dvb_demux_t *dvbdmx=&av7110->demux;
-        dvb_demux_feed_t *feed;
+        struct dvb_demux *dvbdmx=&av7110->demux;
+        struct dvb_demux_feed *feed;
         int mode;
         int i;
 
@@ -4369,7 +4369,7 @@ dvb_register(av7110_t *av7110)
 {
         int ret, i;
         dmx_frontend_t *dvbfront=&av7110->hw_frontend;
-        dvb_demux_t *dvbdemux=&av7110->demux;
+        struct dvb_demux *dvbdemux=&av7110->demux;
 
         if (av7110->registered)
                 return -1;
@@ -4515,7 +4515,7 @@ dvb_register(av7110_t *av7110)
 static void 
 dvb_unregister(av7110_t *av7110)
 {
-        dvb_demux_t *dvbdemux=&av7110->demux;
+        struct dvb_demux *dvbdemux=&av7110->demux;
 
         if (!av7110->registered)
                 return;
diff --git a/linux/drivers/media/dvb/av7110/av7110.h b/linux/drivers/media/dvb/av7110/av7110.h
index d96c21ae5..a4e8acaf7 100644
--- a/linux/drivers/media/dvb/av7110/av7110.h
+++ b/linux/drivers/media/dvb/av7110/av7110.h
@@ -479,7 +479,7 @@ typedef struct p2t_s {
         u8                counter;
         long int          pos;
         int               frags;
-        dvb_demux_feed_t *feed;
+        struct dvb_demux_feed *feed;
 } p2t_t;
 
 
@@ -561,7 +561,7 @@ typedef struct av7110_s {
 
         int                     vidmode;
         dmxdev_t                dmxdev;
-        dvb_demux_t             demux;
+        struct dvb_demux             demux;
         char                    demux_id[16];
 
         dmx_frontend_t          hw_frontend;
@@ -580,7 +580,7 @@ typedef struct av7110_s {
 #define TRICK_FREEZE 3
         struct audio_status      audiostate;
 
-        dvb_demux_filter_t     *handle2filter[32];
+        struct dvb_demux_filter     *handle2filter[32];
         p2t_t                   p2t_filter[MAXFILT];
         dvb_filter_pes2ts_t     p2t[2];
         struct ipack_s          ipack[2];