summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-09 20:36:36 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-09 20:36:36 +0200
commita89f36b0b3e9008cd7f8378e4fa40a3c37d7a23e (patch)
treeacb7dab784340185f86a0009cf057569ffd336a1 /src/input
parent6b0bd243d70f430f9f19a61335a4a38e8a09bc11 (diff)
parentc552e457732c3c7b84b66ed8548713be52561487 (diff)
downloadxine-lib-a89f36b0b3e9008cd7f8378e4fa40a3c37d7a23e.tar.gz
xine-lib-a89f36b0b3e9008cd7f8378e4fa40a3c37d7a23e.tar.bz2
Update from 1.1 branch.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/input_gnome_vfs.c2
-rw-r--r--src/input/pnm.c6
-rw-r--r--src/input/vcd/xineplug_inp_vcd.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/input/input_gnome_vfs.c b/src/input/input_gnome_vfs.c
index b9f516931..540abd0f4 100644
--- a/src/input/input_gnome_vfs.c
+++ b/src/input/input_gnome_vfs.c
@@ -304,7 +304,7 @@ gnomevfs_klass_dispose (input_class_t *this_gen)
g_free (this);
}
-static char * ignore_scheme[] = { "cdda", "file", "http" };
+static const char *const ignore_scheme[] = { "cdda", "file", "http" };
static input_plugin_t *
gnomevfs_klass_get_instance (input_class_t *klass_gen, xine_stream_t *stream,
diff --git a/src/input/pnm.c b/src/input/pnm.c
index 432520f6e..cba0aff1f 100644
--- a/src/input/pnm.c
+++ b/src/input/pnm.c
@@ -169,13 +169,13 @@ static const uint32_t pnm_available_bandwidths[]={14400,19200,28800,33600,34430,
115200,262200,393216,524300,1544000,10485800};
#define PNM_TWENTYFOUR_SIZE 16
-static unsigned char pnm_twentyfour[]={
+static const unsigned char pnm_twentyfour[]={
0xd5, 0x42, 0xa3, 0x1b, 0xef, 0x1f, 0x70, 0x24,
0x85, 0x29, 0xb3, 0x8d, 0xba, 0x11, 0xf3, 0xd6 };
/* now other data follows. marked with 0x0000 at the beginning */
-int after_chunks_length=6;
-unsigned char after_chunks[]={
+static const int after_chunks_length=6;
+static const unsigned char after_chunks[]={
0x00, 0x00, /* mark */
0x50, 0x84, /* seems to be fixated */
diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c
index 920b5c1d8..a15899f2d 100644
--- a/src/input/vcd/xineplug_inp_vcd.c
+++ b/src/input/vcd/xineplug_inp_vcd.c
@@ -88,7 +88,7 @@
Convert an autoplay enumeration into an vcdinfo itemtype enumeration.
See definitions in vcdplayer.h and vcdinfo.h to get the below correct.
*/
-vcdinfo_item_enum_t autoplay2itemtype[]={
+static const vcdinfo_item_enum_t autoplay2itemtype[]={
VCDINFO_ITEM_TYPE_TRACK, /* VCDPLAYER_AUTOPLAY_TRACK */
VCDINFO_ITEM_TYPE_ENTRY, /* VCDPLAYER_AUTOPLAY_ENTRY */
VCDINFO_ITEM_TYPE_SEGMENT, /* VCDPLAYER_AUTOPLAY_SEGMENT */