diff options
| author | rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-05-14 22:06:17 +0000 |
|---|---|---|
| committer | rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-05-14 22:06:17 +0000 |
| commit | 82bcbf62afb9d75d0364c28bd43e3dcd39e78adc (patch) | |
| tree | d9f34dbb2c0059faab0919b61c2c88401ad10b32 /libmpdemux | |
| parent | c471ba947a7c6e4e69cb2f0e2e5224fbd721d86c (diff) | |
| download | mpv-82bcbf62afb9d75d0364c28bd43e3dcd39e78adc.tar.bz2 mpv-82bcbf62afb9d75d0364c28bd43e3dcd39e78adc.tar.xz | |
Fix:
frequencies.c:1168: warning: initialization discards qualifiers from pointer target type
dvbin.c:843: warning: assignment from incompatible pointer type
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18514 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/dvbin.c | 4 | ||||
| -rw-r--r-- | libmpdemux/frequencies.c | 2 | ||||
| -rw-r--r-- | libmpdemux/frequencies.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/dvbin.c b/libmpdemux/dvbin.c index 5374840eb4..e0815b04c2 100644 --- a/libmpdemux/dvbin.c +++ b/libmpdemux/dvbin.c @@ -778,8 +778,8 @@ dvb_config_t *dvb_get_config(void) 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; diff --git a/libmpdemux/frequencies.c b/libmpdemux/frequencies.c index 067e4de858..38eea35aa0 100644 --- a/libmpdemux/frequencies.c +++ b/libmpdemux/frequencies.c @@ -1165,5 +1165,5 @@ const struct CHANLISTS chanlists[] = { }; int chantab = 5; -struct CHANLIST *chanlist = europe_west; +const struct CHANLIST *chanlist = europe_west; int chancount = CHAN_COUNT(europe_west); diff --git a/libmpdemux/frequencies.h b/libmpdemux/frequencies.h index 86bcebc08f..f1fd806544 100644 --- a/libmpdemux/frequencies.h +++ b/libmpdemux/frequencies.h @@ -107,5 +107,5 @@ extern const struct CHANLISTS chanlists[]; //extern struct STRTAB chanlist_names[]; extern int chantab; -extern struct CHANLIST *chanlist; +extern const struct CHANLIST *chanlist; extern int chancount; |