Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 88580 Details for
Bug 135390
media-libs/xine-lib-1.1.2_pre20060328-r9 fails to apply patch 240_all_constplugins.patch
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
240_all_constplugins.patch updated
240_all_constplugins.patch (text/plain), 112.86 KB, created by
Robert Wolf
on 2006-06-07 01:20:48 UTC
(
hide
)
Description:
240_all_constplugins.patch updated
Filename:
MIME Type:
Creator:
Robert Wolf
Created:
2006-06-07 01:20:48 UTC
Size:
112.86 KB
patch
obsolete
>Index: xine-lib-1.1.2cvs20060328/src/audio_out/audio_alsa_out.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/audio_out/audio_alsa_out.c >+++ xine-lib-1.1.2cvs20060328/src/audio_out/audio_alsa_out.c >@@ -1673,7 +1673,7 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static ao_info_t ao_info_alsa = { >+static const ao_info_t ao_info_alsa = { > 10 > }; > >@@ -1681,7 +1681,7 @@ static ao_info_t ao_info_alsa = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_OUT, AO_OUT_ALSA_IFACE_VERSION, "alsa", XINE_VERSION_CODE, &ao_info_alsa, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/audio_out/audio_arts_out.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/audio_out/audio_arts_out.c >+++ xine-lib-1.1.2cvs20060328/src/audio_out/audio_arts_out.c >@@ -397,7 +397,7 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static ao_info_t ao_info_arts = { >+static const ao_info_t ao_info_arts = { > 5 > }; > >@@ -405,7 +405,7 @@ static ao_info_t ao_info_arts = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_OUT, AO_OUT_ARTS_IFACE_VERSION, "arts", XINE_VERSION_CODE, &ao_info_arts, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/audio_out/audio_coreaudio_out.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/audio_out/audio_coreaudio_out.c >+++ xine-lib-1.1.2cvs20060328/src/audio_out/audio_coreaudio_out.c >@@ -591,7 +591,7 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static ao_info_t ao_info_coreaudio = { >+static const ao_info_t ao_info_coreaudio = { > 1 > }; > >@@ -599,7 +599,7 @@ static ao_info_t ao_info_coreaudio = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_OUT, AO_OUT_COREAUDIO_IFACE_VERSION, "coreaudio", XINE_VERSION_CODE, &ao_info_coreaudio, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/audio_out/audio_directx2_out.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/audio_out/audio_directx2_out.c >+++ xine-lib-1.1.2cvs20060328/src/audio_out/audio_directx2_out.c >@@ -1020,11 +1020,11 @@ static void *init_class(xine_t *xine, vo > } > > >-static ao_info_t ao_info_directx2 = { >+static const ao_info_t ao_info_directx2 = { > 10 > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > { PLUGIN_AUDIO_OUT, AO_OUT_DIRECTX2_IFACE_VERSION, "directx2", XINE_VERSION_CODE, &ao_info_directx2, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } > }; >Index: xine-lib-1.1.2cvs20060328/src/audio_out/audio_directx_out.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/audio_out/audio_directx_out.c >+++ xine-lib-1.1.2cvs20060328/src/audio_out/audio_directx_out.c >@@ -856,14 +856,14 @@ static void *init_class (xine_t *xine, v > return audiox; > } > >-static ao_info_t ao_info_directx = { >+static const ao_info_t ao_info_directx = { > 1 /* priority */ > }; > > /* > * exported plugin catalog entry > */ >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_OUT, AO_DIRECTX_IFACE_VERSION, "directx", XINE_VERSION_CODE, &ao_info_directx, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/audio_out/audio_esd_out.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/audio_out/audio_esd_out.c >+++ xine-lib-1.1.2cvs20060328/src/audio_out/audio_esd_out.c >@@ -592,7 +592,7 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static ao_info_t ao_info_esd = { >+static const ao_info_t ao_info_esd = { > 4 > }; > >@@ -600,7 +600,7 @@ static ao_info_t ao_info_esd = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_OUT, AO_OUT_ESD_IFACE_VERSION, "esd", XINE_VERSION_CODE, &ao_info_esd, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/audio_out/audio_file_out.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/audio_out/audio_file_out.c >+++ xine-lib-1.1.2cvs20060328/src/audio_out/audio_file_out.c >@@ -388,7 +388,7 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static ao_info_t ao_info_file = { >+static const ao_info_t ao_info_file = { > -1 /* do not auto probe this one */ > }; > >@@ -396,7 +396,7 @@ static ao_info_t ao_info_file = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_OUT, AO_OUT_FILE_IFACE_VERSION, "file", XINE_VERSION_CODE, &ao_info_file, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/audio_out/audio_fusionsound_out.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/audio_out/audio_fusionsound_out.c >+++ xine-lib-1.1.2cvs20060328/src/audio_out/audio_fusionsound_out.c >@@ -471,7 +471,7 @@ static void* init_class(xine_t *xine, vo > return class; > } > >-static ao_info_t ao_info_fusionsound = { >+static const ao_info_t ao_info_fusionsound = { > 4 > }; > >@@ -479,7 +479,7 @@ static ao_info_t ao_info_fusionsound = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_OUT, AO_OUT_FS_IFACE_VERSION, "FusionSound", > XINE_VERSION_CODE, &ao_info_fusionsound, init_class }, >Index: xine-lib-1.1.2cvs20060328/src/audio_out/audio_irixal_out.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/audio_out/audio_irixal_out.c >+++ xine-lib-1.1.2cvs20060328/src/audio_out/audio_irixal_out.c >@@ -405,7 +405,7 @@ static void *init_audio_out_plugin (conf > return this; > } > >-static ao_info_t ao_info_irixal = { >+static const ao_info_t ao_info_irixal = { > "xine audio output plugin using IRIX libaudio", > 10 > }; >@@ -420,7 +420,7 @@ ao_info_t *get_audio_out_plugin_info() > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_OUT, AO_OUT_IRIXAL_IFACE_VERSION, "irixal", XINE_VERSION_CODE, &ao_info_irixal, init_audio_out_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/audio_out/audio_none_out.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/audio_out/audio_none_out.c >+++ xine-lib-1.1.2cvs20060328/src/audio_out/audio_none_out.c >@@ -249,7 +249,7 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static ao_info_t ao_info_none = { >+static const ao_info_t ao_info_none = { > -1 /* do not auto probe this one */ > }; > >@@ -257,7 +257,7 @@ static ao_info_t ao_info_none = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_OUT, AO_OUT_NONE_IFACE_VERSION, "none", XINE_VERSION_CODE, &ao_info_none, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/audio_out/audio_oss_out.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/audio_out/audio_oss_out.c >+++ xine-lib-1.1.2cvs20060328/src/audio_out/audio_oss_out.c >@@ -1171,7 +1171,7 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static ao_info_t ao_info_oss = { >+static const ao_info_t ao_info_oss = { > 9 /* less than alsa so xine will use alsa's native interface by default */ > }; > >@@ -1179,7 +1179,7 @@ static ao_info_t ao_info_oss = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_OUT, AO_OUT_OSS_IFACE_VERSION, "oss", XINE_VERSION_CODE, &ao_info_oss, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/audio_out/audio_polyp_out.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/audio_out/audio_polyp_out.c >+++ xine-lib-1.1.2cvs20060328/src/audio_out/audio_polyp_out.c >@@ -560,7 +560,7 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static ao_info_t ao_info_polyp = { >+static const ao_info_t ao_info_polyp = { > 6 > }; > >@@ -568,7 +568,7 @@ static ao_info_t ao_info_polyp = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_OUT, 8, "polypaudio", XINE_VERSION_CODE, &ao_info_polyp, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/audio_out/audio_sun_out.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/audio_out/audio_sun_out.c >+++ xine-lib-1.1.2cvs20060328/src/audio_out/audio_sun_out.c >@@ -993,7 +993,7 @@ static void *ao_sun_init_class (xine_t * > } > > >-static ao_info_t ao_info_sun = { >+static const ao_info_t ao_info_sun = { > 10 > }; > >@@ -1001,7 +1001,7 @@ static ao_info_t ao_info_sun = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_OUT, AO_SUN_IFACE_VERSION, "sun", XINE_VERSION_CODE, &ao_info_sun, ao_sun_init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_asf.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_asf.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_asf.c >@@ -2332,11 +2332,11 @@ static void *init_class (xine_t *xine, v > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_asf = { >+static const demuxer_info_t demux_info_asf = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "asf", XINE_VERSION_CODE, &demux_info_asf, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_avi.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_avi.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_avi.c >@@ -2350,11 +2350,11 @@ static void *init_class (xine_t *xine, v > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_avi = { >+static const demuxer_info_t demux_info_avi = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "avi", XINE_VERSION_CODE, &demux_info_avi, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_elem.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_elem.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_elem.c >@@ -301,11 +301,11 @@ static void *init_plugin (xine_t *xine, > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_elem = { >+static const demuxer_info_t demux_info_elem = { > 0 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "elem", XINE_VERSION_CODE, &demux_info_elem, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_fli.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_fli.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_fli.c >@@ -394,11 +394,11 @@ static void *init_plugin (xine_t *xine, > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_fli = { >+static const demuxer_info_t demux_info_fli = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "fli", XINE_VERSION_CODE, &demux_info_fli, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_flv.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_flv.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_flv.c >@@ -339,11 +339,11 @@ static void *init_plugin (xine_t *xine, > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_flv = { >+static const demuxer_info_t demux_info_flv = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "flashvideo", XINE_VERSION_CODE, &demux_info_flv, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_iff.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_iff.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_iff.c >@@ -1330,11 +1330,11 @@ static void *init_plugin (xine_t *xine, > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_iff = { >+static const demuxer_info_t demux_info_iff = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "iff", XINE_VERSION_CODE, &demux_info_iff, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_image.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_image.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_image.c >@@ -260,11 +260,11 @@ static void *init_class (xine_t *xine, v > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_image = { >+static const demuxer_info_t demux_info_image = { > 11 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "image", XINE_VERSION_CODE, &demux_info_image, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_matroska.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_matroska.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_matroska.c >@@ -2727,11 +2727,11 @@ static void *init_class (xine_t *xine, v > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_matroska = { >+static const demuxer_info_t demux_info_matroska = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "matroska", XINE_VERSION_CODE, &demux_info_matroska, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_mng.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_mng.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_mng.c >@@ -374,11 +374,11 @@ static void *init_plugin(xine_t *xine, v > return this; > } > >-demuxer_info_t demux_info_mng = { >+static const demuxer_info_t demux_info_mng = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > { PLUGIN_DEMUX, 26, "mng", XINE_VERSION_CODE, &demux_info_mng, (void*)init_plugin}, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } > }; >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_mpeg_block.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_mpeg_block.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_mpeg_block.c >@@ -1559,11 +1559,11 @@ static void *init_plugin (xine_t *xine, > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_mpeg_block = { >+static const demuxer_info_t demux_info_mpeg_block = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "mpeg_block", XINE_VERSION_CODE, &demux_info_mpeg_block, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_mpeg.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_mpeg.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_mpeg.c >@@ -1263,11 +1263,11 @@ static void *init_plugin (xine_t *xine, > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_mpeg = { >+static const demuxer_info_t demux_info_mpeg = { > 9 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "mpeg", XINE_VERSION_CODE, &demux_info_mpeg, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_mpeg_pes.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_mpeg_pes.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_mpeg_pes.c >@@ -1672,11 +1672,11 @@ static void *init_plugin (xine_t *xine, > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_mpeg_pes = { >+static const demuxer_info_t demux_info_mpeg_pes = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "mpeg_pes", XINE_VERSION_CODE, &demux_info_mpeg_pes, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_nsv.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_nsv.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_nsv.c >@@ -685,11 +685,11 @@ static void *demux_nsv_init_plugin (xine > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_nsv = { >+static const demuxer_info_t demux_info_nsv = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "nsv", XINE_VERSION_CODE, &demux_info_nsv, demux_nsv_init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_ogg.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_ogg.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_ogg.c >@@ -2116,15 +2116,15 @@ static void *ogg_init_class (xine_t *xin > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_anx = { >+static const demuxer_info_t demux_info_anx = { > 20 /* priority */ > }; > >-demuxer_info_t demux_info_ogg = { >+static const demuxer_info_t demux_info_ogg = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "ogg", XINE_VERSION_CODE, &demux_info_ogg, ogg_init_class }, > { PLUGIN_DEMUX, 26, "anx", XINE_VERSION_CODE, &demux_info_anx, anx_init_class }, >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_pva.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_pva.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_pva.c >@@ -520,11 +520,11 @@ static void *init_plugin (xine_t *xine, > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_pva = { >+static const demuxer_info_t demux_info_pva = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "pva", XINE_VERSION_CODE, &demux_info_pva, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_qt.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_qt.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_qt.c >@@ -3086,11 +3086,11 @@ static void *init_plugin (xine_t *xine, > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_qt = { >+static const demuxer_info_t demux_info_qt = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "quicktime", XINE_VERSION_CODE, &demux_info_qt, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_rawdv.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_rawdv.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_rawdv.c >@@ -443,11 +443,11 @@ static void *init_plugin (xine_t *xine, > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_raw_dv = { >+static const demuxer_info_t demux_info_raw_dv = { > 1 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "rawdv", XINE_VERSION_CODE, &demux_info_raw_dv, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_real.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_real.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_real.c >@@ -1651,11 +1651,11 @@ static void *init_class (xine_t *xine, v > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_real = { >+static const demuxer_info_t demux_info_real = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "real", XINE_VERSION_CODE, &demux_info_real, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_slave.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_slave.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_slave.c >@@ -433,11 +433,11 @@ static void *init_plugin (xine_t *xine, > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_slave = { >+static const demuxer_info_t demux_info_slave = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "slave", XINE_VERSION_CODE, &demux_info_slave, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_ts.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_ts.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_ts.c >@@ -2200,11 +2200,11 @@ static void *init_class (xine_t *xine, v > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_ts = { >+static const demuxer_info_t demux_info_ts = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "mpeg-ts", XINE_VERSION_CODE, &demux_info_ts, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_yuv4mpeg2.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_yuv4mpeg2.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_yuv4mpeg2.c >@@ -494,11 +494,11 @@ static void *init_plugin (xine_t *xine, > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_yuv4mpeg2 = { >+static const demuxer_info_t demux_info_yuv4mpeg2 = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "yuv4mpeg2", XINE_VERSION_CODE, &demux_info_yuv4mpeg2, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/demux_yuv_frames.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/demux_yuv_frames.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/demux_yuv_frames.c >@@ -272,11 +272,11 @@ static void *init_class (xine_t *xine, v > /* > * exported plugin catalog entry > */ >-demuxer_info_t demux_info_yuv_frames = { >+static const demuxer_info_t demux_info_yuv_frames = { > 0 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "yuv_frames", XINE_VERSION_CODE, &demux_info_yuv_frames, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/demuxers/group_audio.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/group_audio.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/group_audio.c >@@ -35,77 +35,77 @@ > * exported plugin catalog entries > */ > >-demuxer_info_t demux_info_aac = { >+static const demuxer_info_t demux_info_aac = { > 0 /* priority */ > }; > >-demuxer_info_t demux_info_ac3 = { >+static const demuxer_info_t demux_info_ac3 = { > 8 /* priority */ > }; > >-demuxer_info_t demux_info_aud = { >+static const demuxer_info_t demux_info_aud = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_aiff = { >+static const demuxer_info_t demux_info_aiff = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_cdda = { >+static const demuxer_info_t demux_info_cdda = { > 6 /* priority */ > }; > >-demuxer_info_t demux_info_dts = { >+static const demuxer_info_t demux_info_dts = { > 8 /* priority */ > }; > >-demuxer_info_t demux_info_flac = { >+static const demuxer_info_t demux_info_flac = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_mpgaudio = { >+static const demuxer_info_t demux_info_mpgaudio = { > 0 /* priority */ > }; > >-demuxer_info_t demux_info_mpc = { >+static const demuxer_info_t demux_info_mpc = { > 0 /* priority */ > }; > >-demuxer_info_t demux_info_nsf = { >+static const demuxer_info_t demux_info_nsf = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_realaudio = { >+static const demuxer_info_t demux_info_realaudio = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_shn = { >+static const demuxer_info_t demux_info_shn = { > 0 /* priority */ > }; > >-demuxer_info_t demux_info_snd = { >+static const demuxer_info_t demux_info_snd = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_voc = { >+static const demuxer_info_t demux_info_voc = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_vox = { >+static const demuxer_info_t demux_info_vox = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_wav = { >+static const demuxer_info_t demux_info_wav = { > 6 /* priority */ > }; > > #ifdef HAVE_MODPLUG >-demuxer_info_t demux_info_mod = { >+static const demuxer_info_t demux_info_mod = { > 10 /* priority */ > }; > #endif > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "aac", XINE_VERSION_CODE, &demux_info_aac, demux_aac_init_plugin }, > { PLUGIN_DEMUX, 26, "ac3", XINE_VERSION_CODE, &demux_info_ac3, demux_ac3_init_plugin }, >Index: xine-lib-1.1.2cvs20060328/src/demuxers/group_games.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/demuxers/group_games.c >+++ xine-lib-1.1.2cvs20060328/src/demuxers/group_games.c >@@ -35,51 +35,51 @@ > * exported plugin catalog entries > */ > >-demuxer_info_t demux_info_eawve = { >+static const demuxer_info_t demux_info_eawve = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_idcin = { >+static const demuxer_info_t demux_info_idcin = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_ipmovie = { >+static const demuxer_info_t demux_info_ipmovie = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_vqa = { >+static const demuxer_info_t demux_info_vqa = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_wc3movie = { >+static const demuxer_info_t demux_info_wc3movie = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_roq = { >+static const demuxer_info_t demux_info_roq = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_str = { >+static const demuxer_info_t demux_info_str = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_film = { >+static const demuxer_info_t demux_info_film = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_smjpeg = { >+static const demuxer_info_t demux_info_smjpeg = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_fourxm = { >+static const demuxer_info_t demux_info_fourxm = { > 10 /* priority */ > }; > >-demuxer_info_t demux_info_vmd = { >+static const demuxer_info_t demux_info_vmd = { > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "wve", XINE_VERSION_CODE, &demux_info_eawve, demux_eawve_init_plugin}, > { PLUGIN_DEMUX, 26, "idcin", XINE_VERSION_CODE, &demux_info_idcin, demux_idcin_init_plugin }, >Index: xine-lib-1.1.2cvs20060328/src/dxr3/dxr3_decode_spu.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/dxr3/dxr3_decode_spu.c >+++ xine-lib-1.1.2cvs20060328/src/dxr3/dxr3_decode_spu.c >@@ -68,12 +68,12 @@ static void *dxr3_spudec_init_plugin(x > /* plugin catalog information */ > static uint32_t supported_types[] = { BUF_SPU_DVD, 0 }; > >-static decoder_info_t dxr3_spudec_info = { >+static const decoder_info_t dxr3_spudec_info = { > supported_types, /* supported types */ > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_SPU_DECODER, 16, "dxr3-spudec", XINE_VERSION_CODE, &dxr3_spudec_info, &dxr3_spudec_init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/dxr3/dxr3_decode_video.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/dxr3/dxr3_decode_video.c >+++ xine-lib-1.1.2cvs20060328/src/dxr3/dxr3_decode_video.c >@@ -67,14 +67,14 @@ static void *dxr3_init_plugin(xine_t > > > /* plugin catalog information */ >-static uint32_t supported_types[] = { BUF_VIDEO_MPEG, 0 }; >+static const uint32_t supported_types[] = { BUF_VIDEO_MPEG, 0 }; > >-static decoder_info_t dxr3_video_decoder_info = { >+static const decoder_info_t dxr3_video_decoder_info = { > supported_types, /* supported types */ > 10 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_DECODER, 18, "dxr3-mpeg2", XINE_VERSION_CODE, &dxr3_video_decoder_info, &dxr3_init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/input_cdda.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_cdda.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_cdda.c >@@ -2724,7 +2724,7 @@ static void *init_plugin (xine_t *xine, > return this; > } > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "CD", XINE_VERSION_CODE, NULL, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/input_dvb.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_dvb.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_dvb.c >@@ -3205,7 +3205,7 @@ static void *init_class (xine_t *xine, v > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "DVB", XINE_VERSION_CODE, NULL, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/input_dvd.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_dvd.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_dvd.c >@@ -1906,7 +1906,7 @@ static void *init_class (xine_t *xine, v > } > > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "DVD", XINE_VERSION_CODE, NULL, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/input_file.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_file.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_file.c >@@ -913,7 +913,7 @@ static void *init_plugin (xine_t *xine, > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "FILE", XINE_VERSION_CODE, NULL, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/input_gnome_vfs.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_gnome_vfs.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_gnome_vfs.c >@@ -389,7 +389,7 @@ static input_info_t input_info_gnomevfs > 100 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > { PLUGIN_INPUT | PLUGIN_NO_UNLOAD, 17, "gnomevfs", XINE_VERSION_CODE, > &input_info_gnomevfs, init_input_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/input_http.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_http.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_http.c >@@ -1057,7 +1057,7 @@ static void *init_class (xine_t *xine, v > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "http", XINE_VERSION_CODE, NULL, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/input_mms.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_mms.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_mms.c >@@ -477,7 +477,7 @@ static void *init_class (xine_t *xine, v > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "mms", XINE_VERSION_CODE, NULL, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/input_net.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_net.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_net.c >@@ -543,7 +543,7 @@ static void *init_class (xine_t *xine, v > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_INPUT, 17, "tcp", XINE_VERSION_CODE, NULL, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/input_pnm.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_pnm.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_pnm.c >@@ -299,7 +299,7 @@ static void *init_class (xine_t *xine, v > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_INPUT, 17, "pnm", XINE_VERSION_CODE, NULL, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/input_pvr.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_pvr.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_pvr.c >@@ -1571,7 +1571,7 @@ static void *init_plugin (xine_t *xine, > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "pvr", XINE_VERSION_CODE, NULL, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/input_rtp.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_rtp.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_rtp.c >@@ -777,7 +777,7 @@ static void *init_class (xine_t *xine, v > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_INPUT, 17, "rtp", XINE_VERSION_CODE, NULL, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/input_rtsp.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_rtsp.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_rtsp.c >@@ -311,7 +311,7 @@ static void *init_class (xine_t *xine, v > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_INPUT, 17, "rtsp", XINE_VERSION_CODE, NULL, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/input_smb.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_smb.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_smb.c >@@ -537,7 +537,7 @@ static input_info_t input_info_smb = { > 0 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > { PLUGIN_INPUT, 17, "smb", XINE_VERSION_CODE, &input_info_smb, > init_input_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/input_stdin_fifo.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_stdin_fifo.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_stdin_fifo.c >@@ -383,7 +383,7 @@ static void *init_class (xine_t *xine, v > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_INPUT, 17, "stdin", XINE_VERSION_CODE, NULL, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/input_v4l.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_v4l.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_v4l.c >@@ -1945,7 +1945,7 @@ static void *init_radio_class (xine_t *x > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "v4l_radio", XINE_VERSION_CODE, NULL, init_radio_class }, > { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "v4l_tv", XINE_VERSION_CODE, NULL, init_video_class }, >Index: xine-lib-1.1.2cvs20060328/src/input/input_vcd.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/input_vcd.c >+++ xine-lib-1.1.2cvs20060328/src/input/input_vcd.c >@@ -1113,7 +1113,7 @@ static void *init_class (xine_t *xine, v > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "VCDO", XINE_VERSION_CODE, NULL, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/input/vcd/xineplug_inp_vcd.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/input/vcd/xineplug_inp_vcd.c >+++ xine-lib-1.1.2cvs20060328/src/input/vcd/xineplug_inp_vcd.c >@@ -1982,7 +1982,7 @@ _("For tracking down bugs in the VCD plu > the next API number since in both cases the plugin is broken. > */ > >-const plugin_info_t xine_plugin_info[] = { >+const const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, (char *) SHORT_PLUGIN_NAME, > XINE_VERSION_CODE, NULL, vcd_init }, >Index: xine-lib-1.1.2cvs20060328/src/liba52/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/liba52/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/liba52/xine_decoder.c >@@ -854,12 +854,12 @@ static uint32_t audio_types[] = { > 0 > }; > >-static decoder_info_t dec_info_audio = { >+static const decoder_info_t dec_info_audio = { > audio_types, /* supported types */ > 5 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 15, "a/52", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libdts/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libdts/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libdts/xine_decoder.c >@@ -602,12 +602,12 @@ static uint32_t audio_types[] = { > BUF_AUDIO_DTS, 0 > }; > >-static decoder_info_t dec_info_audio = { >+static const decoder_info_t dec_info_audio = { > audio_types, /* supported types */ > 1 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_DECODER, 15, "dts", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libfaad/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libfaad/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libfaad/xine_decoder.c >@@ -473,12 +473,12 @@ static uint32_t audio_types[] = { > BUF_AUDIO_AAC, 0 > }; > >-static decoder_info_t dec_info_audio = { >+static const decoder_info_t dec_info_audio = { > audio_types, /* supported types */ > 1 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_DECODER, 15, "faad", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libffmpeg/dvaudio_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libffmpeg/dvaudio_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libffmpeg/dvaudio_decoder.c >@@ -442,7 +442,7 @@ decoder_info_t dec_info_dvaudio = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_DECODER, 15, "dvaudio", XINE_VERSION_CODE, &dec_info_dvaudio, init_dvaudio_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libffmpeg/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libffmpeg/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libffmpeg/xine_decoder.c >@@ -143,7 +143,7 @@ void init_once_routine(void) { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 18, "ffmpegvideo", XINE_VERSION_CODE, &dec_info_ffmpeg_video, init_video_plugin }, > { PLUGIN_VIDEO_DECODER, 18, "ffmpeg-wmv8", XINE_VERSION_CODE, &dec_info_ffmpeg_wmv8, init_video_plugin }, >Index: xine-lib-1.1.2cvs20060328/src/libflac/decoder_flac.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libflac/decoder_flac.c >+++ xine-lib-1.1.2cvs20060328/src/libflac/decoder_flac.c >@@ -395,12 +395,12 @@ static uint32_t audio_types[] = { > BUF_AUDIO_FLAC, 0 > }; > >-static decoder_info_t dec_info_audio = { >+static const decoder_info_t dec_info_audio = { > audio_types, /* supported types */ > 5 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "flac", XINE_VERSION_CODE, NULL, demux_flac_init_class }, > { PLUGIN_AUDIO_DECODER, 15, "flacdec", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, >Index: xine-lib-1.1.2cvs20060328/src/liblpcm/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/liblpcm/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/liblpcm/xine_decoder.c >@@ -280,12 +280,12 @@ static uint32_t audio_types[] = { > BUF_AUDIO_LPCM_BE, BUF_AUDIO_LPCM_LE, 0 > }; > >-static decoder_info_t dec_info_audio = { >+static const decoder_info_t dec_info_audio = { > audio_types, /* supported types */ > 1 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_DECODER, 15, "pcm", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libmad/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libmad/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libmad/xine_decoder.c >@@ -363,12 +363,12 @@ static uint32_t audio_types[] = { > BUF_AUDIO_MPEG, 0 > }; > >-static decoder_info_t dec_info_audio = { >+static const decoder_info_t dec_info_audio = { > audio_types, /* supported types */ > 7 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_DECODER, 15, "mad", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libmpeg2/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libmpeg2/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libmpeg2/xine_decoder.c >@@ -172,12 +172,12 @@ static void *init_plugin (xine_t *xine, > > static uint32_t supported_types[] = { BUF_VIDEO_MPEG, 0 }; > >-static decoder_info_t dec_info_mpeg2 = { >+static const decoder_info_t dec_info_mpeg2 = { > supported_types, /* supported types */ > 7 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_DECODER, 18, "mpeg2", XINE_VERSION_CODE, &dec_info_mpeg2, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libmusepack/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libmusepack/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libmusepack/xine_decoder.c >@@ -454,12 +454,12 @@ static uint32_t audio_types[] = { > 0 > }; > >-static decoder_info_t dec_info_audio = { >+static const decoder_info_t dec_info_audio = { > audio_types, /* supported types */ > 5 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* { type, API version, "name", version, special_info, init_function }, */ > { PLUGIN_AUDIO_DECODER, 15, "mpc", XINE_VERSION_CODE, &dec_info_audio, &init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libreal/audio_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libreal/audio_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libreal/audio_decoder.c >@@ -757,12 +757,12 @@ static uint32_t audio_types[] = { > BUF_AUDIO_COOK, BUF_AUDIO_ATRK, /* BUF_AUDIO_14_4, BUF_AUDIO_28_8, */ BUF_AUDIO_SIPRO, 0 > }; > >-static decoder_info_t dec_info_audio = { >+static const decoder_info_t dec_info_audio = { > audio_types, /* supported types */ > 5 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 15, "realadec", XINE_VERSION_CODE, &dec_info_audio, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libreal/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libreal/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libreal/xine_decoder.c >@@ -638,12 +638,12 @@ static uint32_t supported_types[] = { BU > BUF_VIDEO_RV40, > 0 }; > >-static decoder_info_t dec_info_real = { >+static const decoder_info_t dec_info_real = { > supported_types, /* supported types */ > 7 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 18, "real", XINE_VERSION_CODE, &dec_info_real, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libspeex/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libspeex/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libspeex/xine_decoder.c >@@ -431,12 +431,12 @@ static uint32_t audio_types[] = { > BUF_AUDIO_SPEEX, 0 > }; > >-static decoder_info_t dec_info_audio = { >+static const decoder_info_t dec_info_audio = { > audio_types, /* supported types */ > 5 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_DECODER, 15, "speex", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libspucc/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libspucc/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libspucc/xine_decoder.c >@@ -357,12 +357,12 @@ static void *init_spu_decoder_plugin (xi > /* plugin catalog information */ > static uint32_t supported_types[] = { BUF_SPU_CC, 0 }; > >-static decoder_info_t spudec_info = { >+static const decoder_info_t spudec_info = { > supported_types, /* supported types */ > 1 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_SPU_DECODER, 16, "spucc", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libspucmml/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libspucmml/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libspucmml/xine_decoder.c >@@ -537,12 +537,12 @@ static void *init_spu_decoder_plugin (xi > /* plugin catalog information */ > static uint32_t supported_types[] = { BUF_SPU_CMML, 0 }; > >-static decoder_info_t spudec_info = { >+static const decoder_info_t spudec_info = { > supported_types, /* supported types */ > 1 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_SPU_DECODER, 16, "spucmml", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libspudec/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libspudec/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libspudec/xine_decoder.c >@@ -392,12 +392,12 @@ static void *init_plugin (xine_t *xine, > /* plugin catalog information */ > static uint32_t supported_types[] = { BUF_SPU_DVD, 0 }; > >-static decoder_info_t dec_info_data = { >+static const decoder_info_t dec_info_data = { > supported_types, /* supported types */ > 5 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_SPU_DECODER, 16, "spudec", XINE_VERSION_CODE, &dec_info_data, &init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libspudvb/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libspudvb/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libspudvb/xine_decoder.c >@@ -864,12 +864,12 @@ static void *init_spu_decoder_plugin (xi > /* plugin catalog information */ > static uint32_t supported_types[] = { BUF_SPU_DVB, 0 }; > >-static decoder_info_t spudec_info = { >+static const decoder_info_t spudec_info = { > supported_types, /* supported types */ > 1 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > {PLUGIN_SPU_DECODER, 16, "spudvb", XINE_VERSION_CODE, &spudec_info, > &init_spu_decoder_plugin}, >Index: xine-lib-1.1.2cvs20060328/src/libsputext/demux_sputext.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libsputext/demux_sputext.c >+++ xine-lib-1.1.2cvs20060328/src/libsputext/demux_sputext.c >@@ -1513,7 +1513,7 @@ static void *init_sputext_demux_class (x > return this; > } > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_DEMUX, 26, "sputext", XINE_VERSION_CODE, NULL, &init_sputext_demux_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libsputext/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libsputext/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libsputext/xine_decoder.c >@@ -944,12 +944,12 @@ static void *init_spu_decoder_plugin (xi > /* plugin catalog information */ > static uint32_t supported_types[] = { BUF_SPU_TEXT, BUF_SPU_OGM, 0 }; > >-static decoder_info_t spudec_info = { >+static const decoder_info_t spudec_info = { > supported_types, /* supported types */ > 1 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_SPU_DECODER | PLUGIN_MUST_PRELOAD, 16, "sputext", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libtheora/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libtheora/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libtheora/xine_decoder.c >@@ -390,12 +390,12 @@ static void *init_plugin (xine_t *xine, > > static uint32_t supported_types[] = { BUF_VIDEO_THEORA, 0 }; > >-static decoder_info_t dec_info_video = { >+static const decoder_info_t dec_info_video = { > supported_types, /* supported types */ > 5 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_DECODER, 18, "theora", XINE_VERSION_CODE, &dec_info_video, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libvorbis/xine_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libvorbis/xine_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libvorbis/xine_decoder.c >@@ -339,12 +339,12 @@ static uint32_t audio_types[] = { > BUF_AUDIO_VORBIS, 0 > }; > >-static decoder_info_t dec_info_audio = { >+static const decoder_info_t dec_info_audio = { > audio_types, /* supported types */ > 5 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_DECODER, 15, "vorbis", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libw32dll/qt_decoder.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libw32dll/qt_decoder.c >+++ xine-lib-1.1.2cvs20060328/src/libw32dll/qt_decoder.c >@@ -617,7 +617,7 @@ static uint32_t audio_types[] = { > 0 > }; > >-static decoder_info_t qta_dec_info = { >+static const decoder_info_t qta_dec_info = { > audio_types, /* supported types */ > 1 /* priority */ > }; >@@ -1147,12 +1147,12 @@ static void *qtv_init_class (xine_t *xin > > static uint32_t qtv_supported_types[] = { BUF_VIDEO_SORENSON_V3, 0 }; > >-static decoder_info_t qtv_dec_info = { >+static const decoder_info_t qtv_dec_info = { > qtv_supported_types, /* supported types */ > 1 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 18, "qtv", XINE_VERSION_CODE, &qtv_dec_info, qtv_init_class }, > { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 15, "qta", XINE_VERSION_CODE, &qta_dec_info, qta_init_class }, >Index: xine-lib-1.1.2cvs20060328/src/libw32dll/w32codec.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libw32dll/w32codec.c >+++ xine-lib-1.1.2cvs20060328/src/libw32dll/w32codec.c >@@ -1700,7 +1700,7 @@ static uint32_t video_types[] = { > 0 > }; > >-static decoder_info_t dec_info_video = { >+static const decoder_info_t dec_info_video = { > video_types, /* supported types */ > 1 /* priority */ > }; >@@ -1713,12 +1713,12 @@ static uint32_t audio_types[] = { > 0 > }; > >-static decoder_info_t dec_info_audio = { >+static const decoder_info_t dec_info_audio = { > audio_types, /* supported types */ > 1 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 18, "win32v", XINE_VERSION_CODE, &dec_info_video, init_video_decoder_class }, > { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 15, "win32a", XINE_VERSION_CODE, &dec_info_audio, init_audio_decoder_class }, >Index: xine-lib-1.1.2cvs20060328/src/libxineadec/fooaudio.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libxineadec/fooaudio.c >+++ xine-lib-1.1.2cvs20060328/src/libxineadec/fooaudio.c >@@ -335,14 +335,14 @@ static uint32_t audio_types[] = { > * the priority that the plugin should be given with respect to other > * plugins that handle the same buffer type. A plugin with priority (n+1) > * will be used instead of a plugin with priority (n). */ >-static decoder_info_t dec_info_audio = { >+static const decoder_info_t dec_info_audio = { > audio_types, /* supported types */ > 5 /* priority */ > }; > > /* The plugin catalog entry. This is the only information that this plugin > * will export to the public. */ >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* { type, API version, "name", version, special_info, init_function }, */ > { PLUGIN_AUDIO_DECODER, 15, "fooaudio", XINE_VERSION_CODE, &dec_info_audio, &init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libxineadec/gsm610.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libxineadec/gsm610.c >+++ xine-lib-1.1.2cvs20060328/src/libxineadec/gsm610.c >@@ -284,12 +284,12 @@ static uint32_t audio_types[] = { > 0 > }; > >-static decoder_info_t dec_info_audio = { >+static const decoder_info_t dec_info_audio = { > audio_types, /* supported types */ > 9 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_AUDIO_DECODER, 15, "gsm610", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libxineadec/nsf.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libxineadec/nsf.c >+++ xine-lib-1.1.2cvs20060328/src/libxineadec/nsf.c >@@ -279,14 +279,14 @@ static uint32_t audio_types[] = { > * the priority that the plugin should be given with respect to other > * plugins that handle the same buffer type. A plugin with priority (n+1) > * will be used instead of a plugin with priority (n). */ >-static decoder_info_t dec_info_audio = { >+static const decoder_info_t dec_info_audio = { > audio_types, /* supported types */ > 5 /* priority */ > }; > > /* The plugin catalog entry. This is the only information that this plugin > * will export to the public. */ >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* { type, API version, "name", version, special_info, init_function }, */ > { PLUGIN_AUDIO_DECODER, 15, "nsf", XINE_VERSION_CODE, &dec_info_audio, &init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libxinevdec/bitplane.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libxinevdec/bitplane.c >+++ xine-lib-1.1.2cvs20060328/src/libxinevdec/bitplane.c >@@ -1574,18 +1574,18 @@ static void *init_plugin (xine_t *xine, > * exported plugin catalog entry > */ > >-static uint32_t video_types[] = { >+static const uint32_t video_types[] = { > BUF_VIDEO_BITPLANE, > BUF_VIDEO_BITPLANE_BR1, > 0 > }; > >-static decoder_info_t dec_info_video = { >+static const decoder_info_t dec_info_video = { > video_types, /* supported types */ > 1 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_DECODER, 18, "bitplane", XINE_VERSION_CODE, &dec_info_video, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libxinevdec/foovideo.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libxinevdec/foovideo.c >+++ xine-lib-1.1.2cvs20060328/src/libxinevdec/foovideo.c >@@ -274,7 +274,7 @@ static void *init_plugin (xine_t *xine, > * list of valid buffer types (and add a new one if the one you need does > * not exist). Terminate the list with a 0. > */ >-static uint32_t video_types[] = { >+static const uint32_t video_types[] = { > /* BUF_VIDEO_FOOVIDEO, */ > BUF_VIDEO_VQA, > BUF_VIDEO_SORENSON_V3, >@@ -287,7 +287,7 @@ static uint32_t video_types[] = { > * plugins that handle the same buffer type. A plugin with priority (n+1) > * will be used instead of a plugin with priority (n). > */ >-static decoder_info_t dec_info_video = { >+static const decoder_info_t dec_info_video = { > video_types, /* supported types */ > 5 /* priority */ > }; >@@ -296,7 +296,7 @@ static decoder_info_t dec_info_video = { > * The plugin catalog entry. This is the only information that this plugin > * will export to the public. > */ >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* { type, API, "name", version, special_info, init_function } */ > { PLUGIN_VIDEO_DECODER, 18, "foovideo", XINE_VERSION_CODE, &dec_info_video, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libxinevdec/gdkpixbuf.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libxinevdec/gdkpixbuf.c >+++ xine-lib-1.1.2cvs20060328/src/libxinevdec/gdkpixbuf.c >@@ -302,12 +302,12 @@ static void *init_class (xine_t *xine, v > static uint32_t supported_types[] = { BUF_VIDEO_IMAGE, > 0 }; > >-static decoder_info_t dec_info_image = { >+static const decoder_info_t dec_info_image = { > supported_types, /* supported types */ > 7 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_DECODER, 18, "gdkpixbuf", XINE_VERSION_CODE, &dec_info_image, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libxinevdec/image.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libxinevdec/image.c >+++ xine-lib-1.1.2cvs20060328/src/libxinevdec/image.c >@@ -273,12 +273,12 @@ static void *init_class (xine_t *xine, v > static uint32_t supported_types[] = { BUF_VIDEO_IMAGE, > 0 }; > >-static decoder_info_t dec_info_image = { >+static const decoder_info_t dec_info_image = { > supported_types, /* supported types */ > 6 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_DECODER, 18, "image", XINE_VERSION_CODE, &dec_info_image, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libxinevdec/rgb.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libxinevdec/rgb.c >+++ xine-lib-1.1.2cvs20060328/src/libxinevdec/rgb.c >@@ -448,17 +448,17 @@ static void *init_plugin (xine_t *xine, > * exported plugin catalog entry > */ > >-static uint32_t video_types[] = { >+static const uint32_t video_types[] = { > BUF_VIDEO_RGB, > 0 > }; > >-static decoder_info_t dec_info_video = { >+static const decoder_info_t dec_info_video = { > video_types, /* supported types */ > 1 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_DECODER, 18, "rgb", XINE_VERSION_CODE, &dec_info_video, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libxinevdec/yuv.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libxinevdec/yuv.c >+++ xine-lib-1.1.2cvs20060328/src/libxinevdec/yuv.c >@@ -371,7 +371,7 @@ static void *init_plugin (xine_t *xine, > * exported plugin catalog entry > */ > >-static uint32_t video_types[] = { >+static const uint32_t video_types[] = { > BUF_VIDEO_YUY2, > BUF_VIDEO_YV12, > BUF_VIDEO_YVU9, >@@ -380,12 +380,12 @@ static uint32_t video_types[] = { > 0 > }; > >-static decoder_info_t dec_info_video = { >+static const decoder_info_t dec_info_video = { > video_types, /* supported types */ > 1 /* priority */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_DECODER, 18, "yuv", XINE_VERSION_CODE, &dec_info_video, init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/post/audio/audio_filters.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/post/audio/audio_filters.c >+++ xine-lib-1.1.2cvs20060328/src/post/audio/audio_filters.c >@@ -30,13 +30,13 @@ > #include "audio_filters.h" > > >-post_info_t upmix_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; >-post_info_t upmix_mono_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; >-post_info_t stretch_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; >-post_info_t volnorm_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; >+static const post_info_t upmix_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; >+static const post_info_t upmix_mono_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; >+static const post_info_t stretch_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; >+static const post_info_t volnorm_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; > > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_POST, 9, "upmix", XINE_VERSION_CODE, &upmix_special_info, &upmix_init_plugin }, > { PLUGIN_POST, 9, "upmix_mono", XINE_VERSION_CODE, &upmix_mono_special_info, &upmix_mono_init_plugin }, >Index: xine-lib-1.1.2cvs20060328/src/post/deinterlace/xine_plugin.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/post/deinterlace/xine_plugin.c >+++ xine-lib-1.1.2cvs20060328/src/post/deinterlace/xine_plugin.c >@@ -45,9 +45,9 @@ static void *deinterlace_init_plugin(xin > > > /* plugin catalog information */ >-post_info_t deinterlace_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; >+static const post_info_t deinterlace_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_POST | PLUGIN_MUST_PRELOAD, 9, "tvtime", XINE_VERSION_CODE, &deinterlace_special_info, &deinterlace_init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/post/goom/xine_goom.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/post/goom/xine_goom.c >+++ xine-lib-1.1.2cvs20060328/src/post/goom/xine_goom.c >@@ -50,7 +50,7 @@ > #define GOOM_HEIGHT 240 > > /* colorspace conversion methods */ >-const char * goom_csc_methods[]={ >+static const char const * goom_csc_methods[]={ > "Fast but not photorealistic", > "Slow but looks better", > NULL >@@ -108,11 +108,11 @@ static void *goom_init_plugin(xine_t *xi > > > /* plugin catalog information */ >-post_info_t goom_special_info = { >+const post_info_t goom_special_info = { > XINE_POST_TYPE_AUDIO_VISUALIZATION > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_POST | PLUGIN_MUST_PRELOAD, 9, "goom", XINE_VERSION_CODE, &goom_special_info, &goom_init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/post/mosaico/mosaico.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/post/mosaico/mosaico.c >+++ xine-lib-1.1.2cvs20060328/src/post/mosaico/mosaico.c >@@ -39,9 +39,9 @@ > static void *mosaico_init_plugin(xine_t *xine, void *); > > /* plugin catalog information */ >-post_info_t mosaico_special_info = { XINE_POST_TYPE_VIDEO_COMPOSE }; >+static const post_info_t mosaico_special_info = { XINE_POST_TYPE_VIDEO_COMPOSE }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_POST, 9, "mosaico", XINE_VERSION_CODE, &mosaico_special_info, &mosaico_init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/post/mosaico/switch.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/post/mosaico/switch.c >+++ xine-lib-1.1.2cvs20060328/src/post/mosaico/switch.c >@@ -39,9 +39,9 @@ > static void *switch_init_plugin(xine_t *xine, void *); > > /* plugin catalog information */ >-post_info_t switch_special_info = { XINE_POST_TYPE_VIDEO_COMPOSE }; >+static const post_info_t switch_special_info = { XINE_POST_TYPE_VIDEO_COMPOSE }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_POST, 9, "switch", XINE_VERSION_CODE, &switch_special_info, &switch_init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/post/planar/planar.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/post/planar/planar.c >+++ xine-lib-1.1.2cvs20060328/src/post/planar/planar.c >@@ -27,36 +27,36 @@ > #include "xineutils.h" > > extern void *invert_init_plugin(xine_t *xine, void *); >-post_info_t invert_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; >+static const post_info_t invert_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; > > extern void *expand_init_plugin(xine_t *xine, void *); >-post_info_t expand_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; >+static const post_info_t expand_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; > > extern void *fill_init_plugin(xine_t *xine, void*); >-post_info_t fill_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; >+static const post_info_t fill_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; > > extern void *eq_init_plugin(xine_t *xine, void *); >-post_info_t eq_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; >+static const post_info_t eq_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; > > extern void *boxblur_init_plugin(xine_t *xine, void *); >-post_info_t boxblur_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; >+static const post_info_t boxblur_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; > > extern void *denoise3d_init_plugin(xine_t *xine, void *); >-post_info_t denoise3d_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; >+static const post_info_t denoise3d_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; > > extern void *eq2_init_plugin(xine_t *xine, void *); >-post_info_t eq2_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; >+static const post_info_t eq2_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; > > extern void *unsharp_init_plugin(xine_t *xine, void *); >-post_info_t unsharp_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; >+static const post_info_t unsharp_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; > > extern void *pp_init_plugin(xine_t *xine, void *); >-post_info_t pp_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; >+static const post_info_t pp_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; > > extern void *noise_init_plugin(xine_t *xine, void *); >-post_info_t noise_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; >+static const post_info_t noise_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_POST, 9, "expand", XINE_VERSION_CODE, &expand_special_info, &expand_init_plugin }, > { PLUGIN_POST, 9, "fill", XINE_VERSION_CODE, &fill_special_info, &fill_init_plugin }, >Index: xine-lib-1.1.2cvs20060328/src/post/visualizations/fooviz.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/post/visualizations/fooviz.c >+++ xine-lib-1.1.2cvs20060328/src/post/visualizations/fooviz.c >@@ -313,9 +313,9 @@ static void *fooviz_init_plugin(xine_t * > } > > /* plugin catalog information */ >-post_info_t fooviz_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; >+static const post_info_t fooviz_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_POST, 9, "fooviz", XINE_VERSION_CODE, &fooviz_special_info, &fooviz_init_plugin }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/post/visualizations/visualizations.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/post/visualizations/visualizations.c >+++ xine-lib-1.1.2cvs20060328/src/post/visualizations/visualizations.c >@@ -41,12 +41,12 @@ void *fftgraph_init_plugin(xine_t *xine, > */ > > /* plugin catalog information */ >-post_info_t oscope_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; >-post_info_t fftscope_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; >-post_info_t fftgraph_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; >+static const post_info_t oscope_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; >+static const post_info_t fftscope_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; >+static const post_info_t fftgraph_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; > > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_POST, 9, "oscope", XINE_VERSION_CODE, &oscope_special_info, &oscope_init_plugin }, > { PLUGIN_POST, 9, "fftscope", XINE_VERSION_CODE, &fftscope_special_info, &fftscope_init_plugin }, >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_aa.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_aa.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_aa.c >@@ -332,12 +332,12 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static vo_info_t vo_info_aa = { >+static const vo_info_t vo_info_aa = { > 6, > XINE_VISUAL_TYPE_AA > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_OUT, 21, "aa", XINE_VERSION_CODE, &vo_info_aa, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_caca.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_caca.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_caca.c >@@ -333,12 +333,12 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static vo_info_t vo_info_caca = { >+static const vo_info_t vo_info_caca = { > 6, > XINE_VISUAL_TYPE_CACA > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_OUT, 21, "caca", XINE_VERSION_CODE, &vo_info_caca, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_directfb.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_directfb.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_directfb.c >@@ -1577,7 +1577,7 @@ static void *init_class_fb (xine_t *xine > return this; > } > >-static vo_info_t vo_info_directfb_fb = { >+static const vo_info_t vo_info_directfb_fb = { > 8, /* priority */ > XINE_VISUAL_TYPE_FB /* visual type */ > }; >@@ -1768,7 +1768,7 @@ static void *init_class_x11 (xine_t *xin > return this; > } > >-static vo_info_t vo_info_directfb_x11 = { >+static const vo_info_t vo_info_directfb_x11 = { > 8, /* priority */ > XINE_VISUAL_TYPE_X11 /* visual type */ > }; >@@ -1776,7 +1776,7 @@ static vo_info_t vo_info_directfb_x11 = > > /*********/ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_OUT, VIDEO_OUT_DRIVER_IFACE_VERSION, "DirectFB", > XINE_VERSION_CODE, &vo_info_directfb_fb, init_class_fb }, >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_directx.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_directx.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_directx.c >@@ -1264,7 +1264,7 @@ static void *init_class (xine_t *xine, v > return directx; > } > >-static vo_info_t vo_info_win32 = { >+static const vo_info_t vo_info_win32 = { > 7, /* priority */ > XINE_VISUAL_TYPE_DIRECTX /* visual type */ > }; >@@ -1273,7 +1273,7 @@ static vo_info_t vo_info_win32 = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_OUT, 21, "vo_directx", XINE_VERSION_CODE, &vo_info_win32, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_fb.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_fb.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_fb.c >@@ -1122,7 +1122,7 @@ static void *fb_init_class(xine_t *xine, > return this; > } > >-static vo_info_t vo_info_fb = >+static const vo_info_t vo_info_fb = > { > 1, /* priority */ > #ifdef USE_X11_VISUAL >@@ -1133,7 +1133,7 @@ static vo_info_t vo_info_fb = > }; > > /* exported plugin catalog entry */ >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_OUT, 21, "fb", XINE_VERSION_CODE, &vo_info_fb, fb_init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_none.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_none.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_none.c >@@ -301,12 +301,12 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static vo_info_t vo_info_none = { >+static const vo_info_t vo_info_none = { > 5, /* Priority */ > XINE_VISUAL_TYPE_NONE /* Visual type */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_OUT, 21, "none", XINE_VERSION_CODE, &vo_info_none, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_opengl.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_opengl.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_opengl.c >@@ -1982,7 +1982,7 @@ static void *opengl_init_class (xine_t * > } > > >-static vo_info_t vo_info_opengl = { >+static const vo_info_t vo_info_opengl = { > 7, /* priority */ > XINE_VISUAL_TYPE_X11 /* visual type */ > }; >@@ -1992,7 +1992,7 @@ static vo_info_t vo_info_opengl = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_OUT, 21, "opengl", XINE_VERSION_CODE, &vo_info_opengl, opengl_init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_pgx32.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_pgx32.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_pgx32.c >@@ -793,7 +793,7 @@ static void pgx32_dispose_class(video_dr > free(class); > } > >-static vo_info_t vo_info_pgx32 = { >+static const vo_info_t vo_info_pgx32 = { > 10, > XINE_VISUAL_TYPE_X11 > }; >@@ -890,7 +890,7 @@ static void *pgx32_init_class(xine_t *xi > return class; > } > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > {PLUGIN_VIDEO_OUT, 21, "pgx32", XINE_VERSION_CODE, &vo_info_pgx32, pgx32_init_class}, > {PLUGIN_NONE, 0, "", 0, NULL, NULL} > }; >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_pgx64.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_pgx64.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_pgx64.c >@@ -1343,7 +1343,7 @@ static void pgx64_dispose_class(video_dr > free(class); > } > >-static vo_info_t vo_info_pgx64 = { >+static const vo_info_t vo_info_pgx64 = { > 10, > XINE_VISUAL_TYPE_X11 > }; >@@ -1514,7 +1514,7 @@ static void *pgx64_init_class(xine_t *xi > return class; > } > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > {PLUGIN_VIDEO_OUT, 21, "pgx64", XINE_VERSION_CODE, &vo_info_pgx64, pgx64_init_class}, > {PLUGIN_NONE, 0, "", 0, NULL, NULL} > }; >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_sdl.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_sdl.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_sdl.c >@@ -603,12 +603,12 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static vo_info_t vo_info_sdl = { >+static const vo_info_t vo_info_sdl = { > 4, /* priority */ > XINE_VISUAL_TYPE_X11, /* visual type supported by this plugin */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_OUT, 21, "sdl", XINE_VERSION_CODE, &vo_info_sdl, init_class }, > { PLUGIN_NONE, 0, "" , 0 , NULL, NULL} >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_stk.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_stk.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_stk.c >@@ -479,12 +479,12 @@ static void *init_class (xine_t *xine, v > } > > /* what priority should we be (what is low), what vistype should we declare ? */ >-static vo_info_t vo_info_stk = { >+static const vo_info_t vo_info_stk = { > 4, /* priority */ > XINE_VISUAL_TYPE_FB, /* visual type supported by this plugin */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_OUT, 21, "stk", XINE_VERSION_CODE, &vo_info_stk, init_class }, > { PLUGIN_NONE, 0, "" , 0 , NULL, NULL} >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_syncfb.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_syncfb.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_syncfb.c >@@ -1106,7 +1106,7 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static vo_info_t vo_info_syncfb = { >+static const vo_info_t vo_info_syncfb = { > 7, /* priority */ > XINE_VISUAL_TYPE_X11 /* visual type */ > }; >@@ -1115,7 +1115,7 @@ static vo_info_t vo_info_syncfb = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_OUT, 21, "SyncFB", XINE_VERSION_CODE, &vo_info_syncfb, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_vidix.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_vidix.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_vidix.c >@@ -1216,7 +1216,7 @@ static void *vidix_init_class (xine_t *x > return this; > } > >-static vo_info_t vo_info_vidix = { >+static const vo_info_t vo_info_vidix = { > 2, /* priority */ > XINE_VISUAL_TYPE_X11 /* visual type */ > }; >@@ -1298,7 +1298,7 @@ static void *vidixfb_init_class (xine_t > return this; > } > >-static vo_info_t vo_info_vidixfb = { >+static const vo_info_t vo_info_vidixfb = { > 2, /* priority */ > XINE_VISUAL_TYPE_FB /* visual type */ > }; >@@ -1308,7 +1308,7 @@ static vo_info_t vo_info_vidixfb = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > #ifdef HAVE_X11 > { PLUGIN_VIDEO_OUT, 21, "vidix", XINE_VERSION_CODE, &vo_info_vidix, vidix_init_class }, >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_xshm.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_xshm.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_xshm.c >@@ -1289,7 +1289,7 @@ static void *xshm_init_class (xine_t *xi > } > > >-static vo_info_t vo_info_xshm = { >+static const vo_info_t vo_info_xshm = { > 6, /* priority */ > XINE_VISUAL_TYPE_X11 /* visual type */ > }; >@@ -1299,7 +1299,7 @@ static vo_info_t vo_info_xshm = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_OUT, 21, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_xv.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_xv.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_xv.c >@@ -1597,7 +1597,7 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static vo_info_t vo_info_xv = { >+static const vo_info_t vo_info_xv = { > 9, /* priority */ > XINE_VISUAL_TYPE_X11 /* visual type */ > }; >@@ -1606,7 +1606,7 @@ static vo_info_t vo_info_xv = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_OUT, 21, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_xvmc.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_xvmc.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_xvmc.c >@@ -1786,7 +1786,7 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static vo_info_t vo_info_xvmc = { >+static const vo_info_t vo_info_xvmc = { > /* priority must be low until it supports displaying non-accelerated stuff */ > 0, /* priority */ > XINE_VISUAL_TYPE_X11 /* visual type */ >@@ -1796,7 +1796,7 @@ static vo_info_t vo_info_xvmc = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_OUT, 21, "xvmc", XINE_VERSION_CODE, &vo_info_xvmc, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_xxmc.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_xxmc.c >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_xxmc.c >@@ -2633,7 +2633,7 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static vo_info_t vo_info_xxmc = { >+static const vo_info_t vo_info_xxmc = { > /* keep priority lower than Xv for now. we may increase this > * when the xxmc driver is more mature/tested. > */ >@@ -2645,7 +2645,7 @@ static vo_info_t vo_info_xxmc = { > * exported plugin catalog entry > */ > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > { PLUGIN_VIDEO_OUT, 21, "xxmc", XINE_VERSION_CODE, &vo_info_xxmc, init_class }, > { PLUGIN_NONE, 0, "", 0, NULL, NULL } >Index: xine-lib-1.1.2cvs20060328/src/libmpeg2/vlc.h >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libmpeg2/vlc.h >+++ xine-lib-1.1.2cvs20060328/src/libmpeg2/vlc.h >@@ -97,14 +97,14 @@ typedef struct { > #define INTRA MACROBLOCK_INTRA > #define QUANT MACROBLOCK_QUANT > >-static MBtab MB_I [] = { >+static const MBtab MB_I [] = { > {INTRA|QUANT, 2}, {INTRA, 1} > }; > > #define MC MACROBLOCK_MOTION_FORWARD > #define CODED MACROBLOCK_PATTERN > >-static MBtab MB_P [] = { >+static const MBtab MB_P [] = { > {INTRA|QUANT, 6}, {CODED|QUANT, 5}, {MC|CODED|QUANT, 5}, {INTRA, 5}, > {MC, 3}, {MC, 3}, {MC, 3}, {MC, 3}, > {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, >@@ -119,7 +119,7 @@ static MBtab MB_P [] = { > #define BWD MACROBLOCK_MOTION_BACKWARD > #define INTER MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD > >-static MBtab MB_B [] = { >+static const MBtab MB_B [] = { > {0, 0}, {INTRA|QUANT, 6}, > {BWD|CODED|QUANT, 6}, {FWD|CODED|QUANT, 6}, > {INTER|CODED|QUANT, 5}, {INTER|CODED|QUANT, 5}, >@@ -149,11 +149,11 @@ static MBtab MB_B [] = { > #undef INTER > > >-static MVtab MV_4 [] = { >+static const MVtab MV_4 [] = { > { 3, 6}, { 2, 4}, { 1, 3}, { 1, 3}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2} > }; > >-static MVtab MV_10 [] = { >+static const MVtab MV_10 [] = { > { 0,10}, { 0,10}, { 0,10}, { 0,10}, { 0,10}, { 0,10}, { 0,10}, { 0,10}, > { 0,10}, { 0,10}, { 0,10}, { 0,10}, {15,10}, {14,10}, {13,10}, {12,10}, > {11,10}, {10,10}, { 9, 9}, { 9, 9}, { 8, 9}, { 8, 9}, { 7, 9}, { 7, 9}, >@@ -163,12 +163,12 @@ static MVtab MV_10 [] = { > }; > > >-static DMVtab DMV_2 [] = { >+static const DMVtab DMV_2 [] = { > { 0, 1}, { 0, 1}, { 1, 2}, {-1, 2} > }; > > >-static CBPtab CBP_7 [] = { >+static const CBPtab CBP_7 [] = { > {0x22, 7}, {0x12, 7}, {0x0a, 7}, {0x06, 7}, > {0x21, 7}, {0x11, 7}, {0x09, 7}, {0x05, 7}, > {0x3f, 6}, {0x3f, 6}, {0x03, 6}, {0x03, 6}, >@@ -199,7 +199,7 @@ static CBPtab CBP_7 [] = { > {0x3c, 3}, {0x3c, 3}, {0x3c, 3}, {0x3c, 3} > }; > >-static CBPtab CBP_9 [] = { >+static const CBPtab CBP_9 [] = { > {0, 0}, {0x00, 9}, {0x27, 9}, {0x1b, 9}, > {0x3b, 9}, {0x37, 9}, {0x2f, 9}, {0x1f, 9}, > {0x3a, 8}, {0x3a, 8}, {0x36, 8}, {0x36, 8}, >@@ -219,21 +219,21 @@ static CBPtab CBP_9 [] = { > }; > > >-static DCtab DC_lum_5 [] = { >+static const DCtab DC_lum_5 [] = { > {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, > {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, > {0, 3}, {0, 3}, {0, 3}, {0, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, > {4, 3}, {4, 3}, {4, 3}, {4, 3}, {5, 4}, {5, 4}, {6, 5} > }; > >-static DCtab DC_chrom_5 [] = { >+static const DCtab DC_chrom_5 [] = { > {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, > {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, > {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, > {3, 3}, {3, 3}, {3, 3}, {3, 3}, {4, 4}, {4, 4}, {5, 5} > }; > >-static DCtab DC_long [] = { >+static const DCtab DC_long [] = { > {6, 5}, {6, 5}, {6, 5}, {6, 5}, {6, 5}, {6, 5}, { 6, 5}, { 6, 5}, > {6, 5}, {6, 5}, {6, 5}, {6, 5}, {6, 5}, {6, 5}, { 6, 5}, { 6, 5}, > {7, 6}, {7, 6}, {7, 6}, {7, 6}, {7, 6}, {7, 6}, { 7, 6}, { 7, 6}, >@@ -241,7 +241,7 @@ static DCtab DC_long [] = { > }; > > >-static DCTtab DCT_16 [] = { >+static const DCTtab DCT_16 [] = { > {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, > {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, > {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, {129, 0, 0}, >@@ -252,7 +252,7 @@ static DCTtab DCT_16 [] = { > { 31, 1, 0}, { 30, 1, 0}, { 29, 1, 0}, { 28, 1, 0} > }; > >-static DCTtab DCT_15 [] = { >+static const DCTtab DCT_15 [] = { > { 1,40,15}, { 1,39,15}, { 1,38,15}, { 1,37,15}, > { 1,36,15}, { 1,35,15}, { 1,34,15}, { 1,33,15}, > { 1,32,15}, { 2,14,15}, { 2,13,15}, { 2,12,15}, >@@ -267,7 +267,7 @@ static DCTtab DCT_15 [] = { > { 1,17,14}, { 1,17,14}, { 1,16,14}, { 1,16,14} > }; > >-static DCTtab DCT_13 [] = { >+static const DCTtab DCT_13 [] = { > { 11, 2,13}, { 10, 2,13}, { 6, 3,13}, { 4, 4,13}, > { 3, 5,13}, { 2, 7,13}, { 2, 6,13}, { 1,15,13}, > { 1,14,13}, { 1,13,13}, { 1,12,13}, { 27, 1,13}, >@@ -282,12 +282,12 @@ static DCTtab DCT_13 [] = { > { 7, 2,12}, { 7, 2,12}, { 18, 1,12}, { 18, 1,12} > }; > >-static DCTtab DCT_B14_10 [] = { >+static const DCTtab DCT_B14_10 [] = { > { 17, 1,10}, { 6, 2,10}, { 1, 7,10}, { 3, 3,10}, > { 2, 4,10}, { 16, 1,10}, { 15, 1,10}, { 5, 2,10} > }; > >-static DCTtab DCT_B14_8 [] = { >+static const DCTtab DCT_B14_8 [] = { > { 65, 0, 6}, { 65, 0, 6}, { 65, 0, 6}, { 65, 0, 6}, > { 3, 2, 7}, { 3, 2, 7}, { 10, 1, 7}, { 10, 1, 7}, > { 1, 4, 7}, { 1, 4, 7}, { 9, 1, 7}, { 9, 1, 7}, >@@ -299,7 +299,7 @@ static DCTtab DCT_B14_8 [] = { > { 4, 2, 8}, { 2, 3, 8}, { 1, 5, 8}, { 11, 1, 8} > }; > >-static DCTtab DCT_B14AC_5 [] = { >+static const DCTtab DCT_B14AC_5 [] = { > { 1, 3, 5}, { 5, 1, 5}, { 4, 1, 5}, > { 1, 2, 4}, { 1, 2, 4}, { 3, 1, 4}, { 3, 1, 4}, > { 2, 1, 3}, { 2, 1, 3}, { 2, 1, 3}, { 2, 1, 3}, >@@ -309,7 +309,7 @@ static DCTtab DCT_B14AC_5 [] = { > { 1, 1, 2}, { 1, 1, 2}, { 1, 1, 2}, { 1, 1, 2} > }; > >-static DCTtab DCT_B14DC_5 [] = { >+static const DCTtab DCT_B14DC_5 [] = { > { 1, 3, 5}, { 5, 1, 5}, { 4, 1, 5}, > { 1, 2, 4}, { 1, 2, 4}, { 3, 1, 4}, { 3, 1, 4}, > { 2, 1, 3}, { 2, 1, 3}, { 2, 1, 3}, { 2, 1, 3}, >@@ -319,12 +319,12 @@ static DCTtab DCT_B14DC_5 [] = { > { 1, 1, 1}, { 1, 1, 1}, { 1, 1, 1}, { 1, 1, 1} > }; > >-static DCTtab DCT_B15_10 [] = { >+static const DCTtab DCT_B15_10 [] = { > { 6, 2, 9}, { 6, 2, 9}, { 15, 1, 9}, { 15, 1, 9}, > { 3, 4,10}, { 17, 1,10}, { 16, 1, 9}, { 16, 1, 9} > }; > >-static DCTtab DCT_B15_8 [] = { >+static const DCTtab DCT_B15_8 [] = { > { 65, 0, 6}, { 65, 0, 6}, { 65, 0, 6}, { 65, 0, 6}, > { 8, 1, 7}, { 8, 1, 7}, { 9, 1, 7}, { 9, 1, 7}, > { 7, 1, 7}, { 7, 1, 7}, { 3, 2, 7}, { 3, 2, 7}, >@@ -391,14 +391,14 @@ static DCTtab DCT_B15_8 [] = { > }; > > >-static MBAtab MBA_5 [] = { >+static const MBAtab MBA_5 [] = { > {6, 5}, {5, 5}, {4, 4}, {4, 4}, {3, 4}, {3, 4}, > {2, 3}, {2, 3}, {2, 3}, {2, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, > {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, > {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1} > }; > >-static MBAtab MBA_11 [] = { >+static const MBAtab MBA_11 [] = { > {32, 11}, {31, 11}, {30, 11}, {29, 11}, > {28, 11}, {27, 11}, {26, 11}, {25, 11}, > {24, 11}, {23, 11}, {22, 11}, {21, 11}, >Index: xine-lib-1.1.2cvs20060328/src/post/goom/gfontrle.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/post/goom/gfontrle.c >+++ xine-lib-1.1.2cvs20060328/src/post/goom/gfontrle.c >@@ -1,6 +1,6 @@ > /* RGBA C-Source image dump (with zRLE compression) */ > >-const struct { >+static const struct { > unsigned int width; > unsigned int height; > unsigned int bytes_per_pixel; >Index: xine-lib-1.1.2cvs20060328/src/post/goom/gfontrle.h >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/post/goom/gfontrle.h >+++ /dev/null >@@ -1,7 +0,0 @@ >-extern const struct { >- unsigned int width; >- unsigned int height; >- unsigned int bytes_per_pixel; >- unsigned int rle_size; >- unsigned char rle_pixel [49725]; >-} the_font ; >Index: xine-lib-1.1.2cvs20060328/src/post/goom/gfontlib.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/post/goom/gfontlib.c >+++ xine-lib-1.1.2cvs20060328/src/post/goom/gfontlib.c >@@ -1,6 +1,6 @@ > #include "goom_config.h" >-#include "gfontrle.h" > #include "gfontlib.h" >+#include "gfontrle.c" > #include <string.h> > #include <stdlib.h> > >Index: xine-lib-1.1.2cvs20060328/src/post/goom/Makefile.am >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/post/goom/Makefile.am >+++ xine-lib-1.1.2cvs20060328/src/post/goom/Makefile.am >@@ -2,7 +2,8 @@ include $(top_srcdir)/misc/Makefile.comm > > libdir = $(XINE_PLUGINDIR)/post > >-EXTRA_DIST = mmx.c xmmx.c ppc_drawings.s ppc_zoom_ultimate.s diff_against_release.patch >+EXTRA_DIST = mmx.c xmmx.c ppc_drawings.s ppc_zoom_ultimate.s diff_against_release.patch \ >+ gfontrle.c mathtools.c > > ## -fomit-frame-pointer segfaults here > ## Use -O2 if -Os is stripped or x86 does not build >@@ -23,13 +24,13 @@ endif > > xineplug_post_goom_la_SOURCES = $(extra_files) xine_goom.c \ > config_param.c convolve_fx.c cpu_info.c drawmethods.c filters.c flying_stars_fx.c \ >- gfontlib.c gfontrle.c goom_core.c goom_tools.c goomsl.c goomsl_hash.c goomsl_heap.c \ >- goomsl_lex.c goomsl_yacc.c graphic.c ifs.c lines.c mathtools.c \ >+ gfontlib.c goom_core.c goom_tools.c goomsl.c goomsl_hash.c goomsl_heap.c \ >+ goomsl_lex.c goomsl_yacc.c graphic.c ifs.c lines.c \ > plugin_info.c sound_tester.c surf3d.c tentacle3d.c v3d.c > xineplug_post_goom_la_LIBADD = $(XINE_LIB) $(GOOM_LIBS) $(THREAD_LIBS) > xineplug_post_goom_la_LDFLAGS = -avoid-version -module $(XINE_PLUGIN_MIN_SYMS) > >-noinst_HEADERS = cpu_info.h default_scripts.h drawmethods.h gfontlib.h gfontrle.h goom.h \ >+noinst_HEADERS = cpu_info.h default_scripts.h drawmethods.h gfontlib.h goom.h \ > goom_config.h goom_config_param.h goom_filters.h goom_fx.h goom_graphic.h \ > goom_plugin_info.h goom_tools.h goom_typedefs.h goom_visual_fx.h goomsl.h goomsl_hash.h \ > goomsl_heap.h goomsl_private.h goomsl_yacc.h ifs.h lines.h mathtools.h mmx.h \ >Index: xine-lib-1.1.2cvs20060328/src/video_out/video_out_macosx.m >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/video_out/video_out_macosx.m >+++ xine-lib-1.1.2cvs20060328/src/video_out/video_out_macosx.m >@@ -372,7 +372,7 @@ static void *init_class (xine_t *xine, v > return this; > } > >-static vo_info_t vo_info_macosx = { >+static const vo_info_t vo_info_macosx = { > 1, /* Priority */ > XINE_VISUAL_TYPE_MACOSX /* Visual type */ > }; >Index: xine-lib-1.1.2cvs20060328/src/dxr3/video_out_dxr3.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/dxr3/video_out_dxr3.c >+++ xine-lib-1.1.2cvs20060328/src/dxr3/video_out_dxr3.c >@@ -80,18 +80,18 @@ static dxr3_driver_class_t *dxr3_vo_init > > /* plugin catalog information */ > #ifdef HAVE_X11 >-static vo_info_t vo_info_dxr3_x11 = { >+static const vo_info_t vo_info_dxr3_x11 = { > 10, /* priority */ > XINE_VISUAL_TYPE_X11 /* visual type */ > }; > #endif > >-static vo_info_t vo_info_dxr3_aa = { >+static const vo_info_t vo_info_dxr3_aa = { > 10, /* priority */ > XINE_VISUAL_TYPE_AA /* visual type */ > }; > >-plugin_info_t xine_plugin_info[] = { >+const plugin_info_t xine_plugin_info[] = { > /* type, API, "name", version, special_info, init_function */ > #ifdef HAVE_X11 > { PLUGIN_VIDEO_OUT, 21, "dxr3", XINE_VERSION_CODE, &vo_info_dxr3_x11, &dxr3_x11_init_plugin }, >@@ -223,12 +223,12 @@ static vo_driver_t *dxr3_vo_open_plugin( > plugin_node_t *node; > > #ifdef HAVE_X11 >- static char *videoout_modes[] = { "letterboxed tv", "widescreen tv", >+ static const char const *videoout_modes[] = { "letterboxed tv", "widescreen tv", > "letterboxed overlay", "widescreen overlay", NULL }; > #else >- static char *videoout_modes[] = { "letterboxed tv", "widescreen tv", NULL }; >+ static const char const *videoout_modes[] = { "letterboxed tv", "widescreen tv", NULL }; > #endif >- static char *tv_modes[] = { "ntsc", "pal", "pal60" , "default", NULL }; >+ static const char const *tv_modes[] = { "ntsc", "pal", "pal60" , "default", NULL }; > int list_id, list_size; > xine_sarray_t *plugin_list; > >@@ -1247,7 +1247,7 @@ static void dxr3_dispose(vo_driver_t *th > close(this->fd_control); > pthread_mutex_lock(&this->spu_device_lock); > if (this->fd_spu) { >- uint8_t empty_spu[] = { >+ static const uint8_t empty_spu[] = { > 0x00, 0x26, 0x00, 0x08, 0x80, 0x00, 0x00, 0x80, > 0x00, 0x00, 0x00, 0x20, 0x01, 0x03, 0x00, 0x00, > 0x04, 0x00, 0x00, 0x05, 0x00, 0x00, 0x01, 0x00, >Index: xine-lib-1.1.2cvs20060328/src/libmpeg2/header.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libmpeg2/header.c >+++ xine-lib-1.1.2cvs20060328/src/libmpeg2/header.c >@@ -34,7 +34,7 @@ > #include "attributes.h" > > /* default intra quant matrix, in zig-zag order */ >-static uint8_t default_intra_quantizer_matrix[64] ATTR_ALIGN(16) = { >+static const uint8_t default_intra_quantizer_matrix[64] ATTR_ALIGN(16) = { > 8, > 16, 16, > 19, 16, 19, >Index: xine-lib-1.1.2cvs20060328/src/libmpeg2/idct_altivec.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libmpeg2/idct_altivec.c >+++ xine-lib-1.1.2cvs20060328/src/libmpeg2/idct_altivec.c >@@ -489,7 +489,7 @@ void mpeg2_idct_add_altivec (int16_t * b > ); > } > >-static int16_t constants[5][8] ATTR_ALIGN(16) = { >+static const int16_t constants[5][8] ATTR_ALIGN(16) = { > {23170, 13573, 6518, 21895, -23170, -21895, 32, 31}, > {16384, 22725, 21407, 19266, 16384, 19266, 21407, 22725}, > {22725, 31521, 29692, 26722, 22725, 26722, 29692, 31521}, >Index: xine-lib-1.1.2cvs20060328/src/libmpeg2/slice_xvmc.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libmpeg2/slice_xvmc.c >+++ xine-lib-1.1.2cvs20060328/src/libmpeg2/slice_xvmc.c >@@ -46,7 +46,7 @@ > #include "vlc.h" > /* original (non-patched) scan tables */ > >-static uint8_t mpeg2_scan_norm_orig[64] ATTR_ALIGN(16) = >+static const uint8_t mpeg2_scan_norm_orig[64] ATTR_ALIGN(16) = > { > /* Zig-Zag scan pattern */ > 0, 1, 8,16, 9, 2, 3,10, >@@ -59,7 +59,7 @@ static uint8_t mpeg2_scan_norm_orig[64] > 53,60,61,54,47,55,62,63 > }; > >-static uint8_t mpeg2_scan_alt_orig[64] ATTR_ALIGN(16) = >+static const uint8_t mpeg2_scan_alt_orig[64] ATTR_ALIGN(16) = > { > /* Alternate scan pattern */ > 0,8,16,24,1,9,2,10,17,25,32,40,48,56,57,49, >@@ -68,9 +68,9 @@ static uint8_t mpeg2_scan_alt_orig[64] A > 53,61,22,30,7,15,23,31,38,46,54,62,39,47,55,63 > }; > >-uint8_t mpeg2_scan_alt_ptable[64] ATTR_ALIGN(16); >-uint8_t mpeg2_scan_norm_ptable[64] ATTR_ALIGN(16); >-uint8_t mpeg2_scan_orig_ptable[64] ATTR_ALIGN(16); >+static uint8_t mpeg2_scan_alt_ptable[64] ATTR_ALIGN(16); >+static uint8_t mpeg2_scan_norm_ptable[64] ATTR_ALIGN(16); >+static uint8_t mpeg2_scan_orig_ptable[64] ATTR_ALIGN(16); > > void xvmc_setup_scan_ptable( void ) > { >@@ -83,7 +83,7 @@ void xvmc_setup_scan_ptable( void ) > } > > >-static int non_linear_quantizer_scale [] = { >+static const int non_linear_quantizer_scale [] = { > 0, 1, 2, 3, 4, 5, 6, 7, > 8, 10, 12, 14, 16, 18, 20, 22, > 24, 28, 32, 36, 40, 44, 48, 52, >Index: xine-lib-1.1.2cvs20060328/src/libmpeg2/slice_xvmc_vld.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libmpeg2/slice_xvmc_vld.c >+++ xine-lib-1.1.2cvs20060328/src/libmpeg2/slice_xvmc_vld.c >@@ -23,7 +23,7 @@ > #include "mpeg2_internal.h" > #include "xvmc_vld.h" > >-static uint8_t zig_zag_scan[64] ATTR_ALIGN(16) = >+static const uint8_t zig_zag_scan[64] ATTR_ALIGN(16) = > { > /* Zig-Zag scan pattern */ > 0, 1, 8,16, 9, 2, 3,10, >@@ -36,7 +36,7 @@ static uint8_t zig_zag_scan[64] ATTR_ALI > 53,60,61,54,47,55,62,63 > }; > >-static uint8_t alternate_scan [64] ATTR_ALIGN(16) = >+static const uint8_t alternate_scan [64] ATTR_ALIGN(16) = > { > /* Alternate scan pattern */ > 0,8,16,24,1,9,2,10,17,25,32,40,48,56,57,49, >Index: xine-lib-1.1.2cvs20060328/src/libmpeg2/xvmc.h >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/libmpeg2/xvmc.h >+++ xine-lib-1.1.2cvs20060328/src/libmpeg2/xvmc.h >@@ -26,10 +26,6 @@ > > /* slice_xvmc.c */ > >-extern uint8_t mpeg2_scan_alt_ptable[64] ATTR_ALIGN(16); >-extern uint8_t mpeg2_scan_norm_ptable[64] ATTR_ALIGN(16); >-extern uint8_t mpeg2_scan_orig_ptable[64] ATTR_ALIGN(16); >- > void mpeg2_xvmc_slice (mpeg2dec_accel_t *accel, picture_t * picture, int code, uint8_t * buffer); > void xvmc_setup_scan_ptable( void ); > >Index: xine-lib-1.1.2cvs20060328/src/post/goom/mathtools.c >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/post/goom/mathtools.c >+++ xine-lib-1.1.2cvs20060328/src/post/goom/mathtools.c >@@ -10,7 +10,7 @@ > > #include "mathtools.h" > >-float sin256[256] = { >+static const float sin256[256] = { > 0,0.0245412,0.0490677,0.0735646,0.0980171,0.122411,0.14673,0.170962 > ,0.19509,0.219101,0.24298,0.266713,0.290285,0.313682,0.33689,0.359895 > ,0.382683,0.405241,0.427555,0.449611,0.471397,0.492898,0.514103,0.534998 >@@ -46,7 +46,7 @@ float sin256[256] = { > > }; > >-float cos256[256] = { >+static const float cos256[256] = { > 0,0.999699,0.998795,0.99729,0.995185,0.99248,0.989177,0.985278 > ,0.980785,0.975702,0.970031,0.963776,0.95694,0.949528,0.941544,0.932993 > ,0.92388,0.91421,0.903989,0.893224,0.881921,0.870087,0.857729,0.844854 >Index: xine-lib-1.1.2cvs20060328/src/post/goom/mathtools.h >=================================================================== >--- xine-lib-1.1.2cvs20060328.orig/src/post/goom/mathtools.h >+++ xine-lib-1.1.2cvs20060328/src/post/goom/mathtools.h >@@ -29,8 +29,7 @@ > #define SINCOS(f,s,c) {s=sin(f);c=cos(f);} > #endif > >-extern float sin256[256]; >-extern float cos256[256]; >+#include "mathtools.c" > > #endif >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=88580">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 135390
: 88580
