[MPlayer-cvslog] CVS: main/libmpdemux frequencies.c, 1.3, 1.4 frequencies.h, 1.3, 1.4 dvbin.c, 1.21, 1.22

[Dominik Mierzejewski CVS]

CVS change done by Dominik Mierzejewski CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv1989/libmpdemux

Modified Files:
	frequencies.c frequencies.h dvbin.c 
Log Message:
Fix:
frequencies.c:1168: warning: initialization discards qualifiers from pointer target type
dvbin.c:843: warning: assignment from incompatible pointer type


Index: frequencies.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/frequencies.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- frequencies.c	3 Apr 2006 06:38:55 -0000	1.3
+++ frequencies.c	14 May 2006 22:06:17 -0000	1.4
@@ -1165,5 +1165,5 @@
 };
 
 int                chantab   = 5;
-struct CHANLIST   *chanlist  = europe_west;
+const struct CHANLIST *chanlist  = europe_west;
 int                chancount = CHAN_COUNT(europe_west);

Index: frequencies.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/frequencies.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- frequencies.h	3 Apr 2006 06:38:55 -0000	1.3
+++ frequencies.h	14 May 2006 22:06:17 -0000	1.4
@@ -107,5 +107,5 @@
 //extern struct STRTAB chanlist_names[];
 
 extern int                chantab;
-extern struct CHANLIST   *chanlist;
+extern const struct CHANLIST *chanlist;
 extern int                chancount;

Index: dvbin.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/dvbin.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- dvbin.c	13 May 2006 09:08:28 -0000	1.21
+++ dvbin.c	14 May 2006 22:06:17 -0000	1.22
@@ -778,8 +778,8 @@
 	int i, fd, type, size;
 	char filename[30], *conf_file, *name;
 	dvb_channels_list *list;
-	dvb_card_config_t *cards = NULL;
-	dvb_config_t *conf = NULL, *tmp;
+	dvb_card_config_t *cards = NULL, *tmp;
+	dvb_config_t *conf = NULL;
 	
 	if(dvb_config != NULL)
 		return dvb_config;