summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-16 01:40:24 +0000
committerreynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-16 01:40:24 +0000
commit15e8c12de234ddd93366def38b807567928fbb40 (patch)
tree6736b2a829cd66460dcc765391e3296ab646196a /libmpdemux
parentca57bf90332aa59bba3385fa13cff139b7a20295 (diff)
downloadmpv-15e8c12de234ddd93366def38b807567928fbb40.tar.bz2
mpv-15e8c12de234ddd93366def38b807567928fbb40.tar.xz
marks several strings inside structs as const when they hold just
read-only information and modifies GetLanguage in Gui/mplayer/gtk/menu.c to cope which the changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19115 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_ogg.c6
-rw-r--r--libmpdemux/extension.c2
-rw-r--r--libmpdemux/frequencies.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index e997fb562b..f521e4ca42 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -463,13 +463,13 @@ static int demux_ogg_sub_reverse_id(demuxer_t *demuxer, int id);
/// Try to print out comments and also check for LANGUAGE= tag
static void demux_ogg_check_comments(demuxer_t *d, ogg_stream_t *os, int id, vorbis_comment *vc)
{
- char *hdr, *val;
+ const char *hdr, *val;
char **cmt = vc->user_comments;
int index, i;
ogg_demuxer_t *ogg_d = (ogg_demuxer_t *)d->priv;
struct table {
- char *ogg;
- char *mp;
+ const char *ogg;
+ const char *mp;
} table[] = {
{ "ENCODED_USING", "Software" },
{ "ENCODER_URL", "Encoder URL" },
diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c
index a75134db3e..df1fb2b368 100644
--- a/libmpdemux/extension.c
+++ b/libmpdemux/extension.c
@@ -12,7 +12,7 @@
* An autodetection based on the extension is not a good idea, but we don't care ;-)
*/
static struct {
- char *extension;
+ const char *extension;
int demuxer_type;
} extensions_table[] = {
// { "mpeg", DEMUXER_TYPE_MPEG_PS },
diff --git a/libmpdemux/frequencies.h b/libmpdemux/frequencies.h
index f1fd806544..13cf111f44 100644
--- a/libmpdemux/frequencies.h
+++ b/libmpdemux/frequencies.h
@@ -94,7 +94,7 @@ struct CHANLIST {
};
struct CHANLISTS {
- char *name;
+ const char *name;
const struct CHANLIST *list;
int count;
};