Mercurial > mplayer.hg
changeset 18513:9ab0369054dd
Fix:
frequencies.c:1168: warning: initialization discards qualifiers from pointer target type
dvbin.c:843: warning: assignment from incompatible pointer type
| author | rathann |
|---|---|
| date | Sun, 14 May 2006 22:06:17 +0000 |
| parents | 7c0af53fcd4a |
| children | 79b7dc1cdc10 |
| files | libmpdemux/dvbin.c libmpdemux/frequencies.c libmpdemux/frequencies.h |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/dvbin.c Sun May 14 22:03:24 2006 +0000 +++ b/libmpdemux/dvbin.c Sun May 14 22:06:17 2006 +0000 @@ -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;
--- a/libmpdemux/frequencies.c Sun May 14 22:03:24 2006 +0000 +++ b/libmpdemux/frequencies.c Sun May 14 22:06:17 2006 +0000 @@ -1165,5 +1165,5 @@ }; int chantab = 5; -struct CHANLIST *chanlist = europe_west; +const struct CHANLIST *chanlist = europe_west; int chancount = CHAN_COUNT(europe_west);
--- a/libmpdemux/frequencies.h Sun May 14 22:03:24 2006 +0000 +++ b/libmpdemux/frequencies.h Sun May 14 22:06:17 2006 +0000 @@ -107,5 +107,5 @@ //extern struct STRTAB chanlist_names[]; extern int chantab; -extern struct CHANLIST *chanlist; +extern const struct CHANLIST *chanlist; extern int chancount;