[MPlayer-cvslog] CVS: main/libmpdemux tv.h, 1.31, 1.32 frequencies.h, 1.2, 1.3 frequencies.c, 1.2, 1.3
Richard Felker CVS
syncmail at mplayerhq.hu
Mon Apr 3 08:38:58 CEST 2006
CVS change done by Richard Felker CVS
Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv14361
Modified Files:
tv.h frequencies.h frequencies.c
Log Message:
10l: huge amount of constant crap in data segment
Index: tv.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- tv.h 18 Nov 2005 14:39:20 -0000 1.31
+++ tv.h 3 Apr 2006 06:38:55 -0000 1.32
@@ -82,7 +82,7 @@
/* specific */
int norm;
int chanlist;
- struct CHANLIST *chanlist_s;
+ const struct CHANLIST *chanlist_s;
int channel;
} tvi_handle_t;
Index: frequencies.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/frequencies.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- frequencies.h 14 May 2005 20:26:46 -0000 1.2
+++ frequencies.h 3 Apr 2006 06:38:55 -0000 1.3
@@ -89,21 +89,21 @@
/* --------------------------------------------------------------------- */
struct CHANLIST {
- char *name;
+ char name[8];
int freq;
};
struct CHANLISTS {
- char *name;
- struct CHANLIST *list;
- int count;
+ char *name;
+ const struct CHANLIST *list;
+ int count;
};
#define CHAN_COUNT(x) (sizeof(x)/sizeof(struct CHANLIST))
/* --------------------------------------------------------------------- */
-extern struct CHANLISTS chanlists[];
+extern const struct CHANLISTS chanlists[];
//extern struct STRTAB chanlist_names[];
extern int chantab;
Index: frequencies.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/frequencies.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- frequencies.c 20 Dec 2002 13:18:41 -0000 1.2
+++ frequencies.c 3 Apr 2006 06:38:55 -0000 1.3
@@ -6,7 +6,7 @@
/* --------------------------------------------------------------------- */
/* US broadcast */
-static struct CHANLIST ntsc_bcast[] = {
+static const struct CHANLIST ntsc_bcast[] = {
{ "2", 55250 },
{ "3", 61250 },
{ "4", 67250 },
@@ -93,7 +93,7 @@
};
/* US cable */
-static struct CHANLIST ntsc_cable[] = {
+static const struct CHANLIST ntsc_cable[] = {
{ "1", 73250 },
{ "2", 55250 },
{ "3", 61250 },
@@ -234,7 +234,7 @@
};
/* US HRC */
-static struct CHANLIST ntsc_hrc[] = {
+static const struct CHANLIST ntsc_hrc[] = {
{ "1", 72000 },
{ "2", 54000 },
{ "3", 60000 },
@@ -377,7 +377,7 @@
/* --------------------------------------------------------------------- */
/* JP broadcast */
-static struct CHANLIST ntsc_bcast_jp[] = {
+static const struct CHANLIST ntsc_bcast_jp[] = {
{ "1", 91250 },
{ "2", 97250 },
{ "3", 103250 },
@@ -445,7 +445,7 @@
};
/* JP cable */
-static struct CHANLIST ntsc_cable_jp[] = {
+static const struct CHANLIST ntsc_cable_jp[] = {
{ "13", 109250 },
{ "14", 115250 },
{ "15", 121250 },
@@ -503,7 +503,7 @@
/* --------------------------------------------------------------------- */
/* australia */
-static struct CHANLIST pal_australia[] = {
+static const struct CHANLIST pal_australia[] = {
{ "0", 46250 },
{ "1", 57250 },
{ "2", 64250 },
@@ -717,14 +717,14 @@
{ "68", 847250 }, \
{ "69", 855250 }
-static struct CHANLIST europe_west[] = {
+static const struct CHANLIST europe_west[] = {
FREQ_CCIR_I_III,
FREQ_CCIR_SL_SH,
FREQ_CCIR_H,
FREQ_UHF
};
-static struct CHANLIST europe_east[] = {
+static const struct CHANLIST europe_east[] = {
FREQ_OIRT_I_III,
FREQ_OIRT_SL_SH,
FREQ_CCIR_I_III,
@@ -733,7 +733,7 @@
FREQ_UHF
};
-static struct CHANLIST pal_italy[] = {
+static const struct CHANLIST pal_italy[] = {
{ "A", 53750 },
{ "B", 62250 },
{ "C", 82250 },
@@ -747,7 +747,7 @@
FREQ_UHF
};
-static struct CHANLIST pal_ireland[] = {
+static const struct CHANLIST pal_ireland[] = {
{ "0", 45750 },
{ "1", 53750 },
{ "2", 61750 },
@@ -760,7 +760,7 @@
FREQ_UHF,
};
-static struct CHANLIST secam_france[] = {
+static const struct CHANLIST secam_france[] = {
{ "K01", 47750 },
{ "K02", 55750 },
{ "K03", 60500 },
@@ -811,7 +811,7 @@
/* --------------------------------------------------------------------- */
-static struct CHANLIST pal_newzealand[] = {
+static const struct CHANLIST pal_newzealand[] = {
{ "1", 45250 },
{ "2", 55250 },
{ "3", 62250 },
@@ -829,7 +829,7 @@
/* --------------------------------------------------------------------- */
/* China broadcast */
-static struct CHANLIST pal_bcast_cn[] = {
+static const struct CHANLIST pal_bcast_cn[] = {
{ "1", 49750 },
{ "2", 57750 },
{ "3", 65750 },
@@ -929,7 +929,7 @@
/* --------------------------------------------------------------------- */
/* South Africa Broadcast */
-static struct CHANLIST pal_bcast_za[] ={
+static const struct CHANLIST pal_bcast_za[] ={
{ "1", 175250 },
{ "2", 183250 },
{ "3", 191250 },
@@ -943,7 +943,7 @@
/* --------------------------------------------------------------------- */
-static struct CHANLIST argentina[] = {
+static const struct CHANLIST argentina[] = {
{ "001", 56250 },
{ "002", 62250 },
{ "003", 68250 },
@@ -1041,7 +1041,7 @@
/* --------------------------------------------------------------------- */
-static struct CHANLIST russia[] = {
+static const struct CHANLIST russia[] = {
{"1", 49750 },
{"2", 59250 },
{"3", 77250 },
@@ -1144,7 +1144,7 @@
};
/* --------------------------------------------------------------------- */
-struct CHANLISTS chanlists[] = {
+const struct CHANLISTS chanlists[] = {
{ "us-bcast", ntsc_bcast, CHAN_COUNT(ntsc_bcast) },
{ "us-cable", ntsc_cable, CHAN_COUNT(ntsc_cable) },
{ "us-cable-hrc", ntsc_hrc, CHAN_COUNT(ntsc_hrc) },
More information about the MPlayer-cvslog
mailing list