summaryrefslogtreecommitdiffstats
path: root/libmpdemux/dvbin.c
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-05-14 22:06:17 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-05-14 22:06:17 +0000
commit82bcbf62afb9d75d0364c28bd43e3dcd39e78adc (patch)
treed9f34dbb2c0059faab0919b61c2c88401ad10b32 /libmpdemux/dvbin.c
parentc471ba947a7c6e4e69cb2f0e2e5224fbd721d86c (diff)
downloadmpv-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/dvbin.c')
-rw-r--r--libmpdemux/dvbin.c4
1 files changed, 2 insertions, 2 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;