summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libmpdemux/demux_aac.c2
-rw-r--r--libmpdemux/demux_asf.c2
-rw-r--r--libmpdemux/demux_audio.c2
-rw-r--r--libmpdemux/demux_avi.c10
-rw-r--r--libmpdemux/demux_avs.c2
-rw-r--r--libmpdemux/demux_demuxers.c4
-rw-r--r--libmpdemux/demux_film.c2
-rw-r--r--libmpdemux/demux_fli.c2
-rw-r--r--libmpdemux/demux_gif.c2
-rw-r--r--libmpdemux/demux_lavf.c4
-rw-r--r--libmpdemux/demux_lmlm4.c2
-rw-r--r--libmpdemux/demux_mf.c2
-rw-r--r--libmpdemux/demux_mkv.c2
-rw-r--r--libmpdemux/demux_mov.c2
-rw-r--r--libmpdemux/demux_mpc.c2
-rw-r--r--libmpdemux/demux_mpg.c12
-rw-r--r--libmpdemux/demux_nemesi.c2
-rw-r--r--libmpdemux/demux_nsv.c2
-rw-r--r--libmpdemux/demux_nut.c2
-rw-r--r--libmpdemux/demux_nuv.c2
-rw-r--r--libmpdemux/demux_ogg.c2
-rw-r--r--libmpdemux/demux_pva.c2
-rw-r--r--libmpdemux/demux_rawaudio.c2
-rw-r--r--libmpdemux/demux_rawdv.c2
-rw-r--r--libmpdemux/demux_rawvideo.c2
-rw-r--r--libmpdemux/demux_real.c2
-rw-r--r--libmpdemux/demux_realaud.c2
-rw-r--r--libmpdemux/demux_roq.c2
-rw-r--r--libmpdemux/demux_smjpeg.c2
-rw-r--r--libmpdemux/demux_ts.c2
-rw-r--r--libmpdemux/demux_ty.c2
-rw-r--r--libmpdemux/demux_viv.c2
-rw-r--r--libmpdemux/demux_vqf.c2
-rw-r--r--libmpdemux/demux_xmms.c2
-rw-r--r--libmpdemux/demux_y4m.c2
-rw-r--r--libmpdemux/demuxer.c84
36 files changed, 88 insertions, 88 deletions
diff --git a/libmpdemux/demux_aac.c b/libmpdemux/demux_aac.c
index e8eb8330b9..79ec802917 100644
--- a/libmpdemux/demux_aac.c
+++ b/libmpdemux/demux_aac.c
@@ -250,7 +250,7 @@ static void demux_aac_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_
}
-demuxer_desc_t demuxer_desc_aac = {
+const demuxer_desc_t demuxer_desc_aac = {
"AAC demuxer",
"aac",
"AAC",
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c
index 17b07047a1..963bd40512 100644
--- a/libmpdemux/demux_asf.c
+++ b/libmpdemux/demux_asf.c
@@ -645,7 +645,7 @@ static void demux_close_asf(demuxer_t *demuxer) {
free(asf);
}
-demuxer_desc_t demuxer_desc_asf = {
+const demuxer_desc_t demuxer_desc_asf = {
"ASF demuxer",
"asf",
"ASF",
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index 295bebe2fd..683ae8d625 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -712,7 +712,7 @@ static int demux_audio_control(demuxer_t *demuxer,int cmd, void *arg){
}
-demuxer_desc_t demuxer_desc_audio = {
+const demuxer_desc_t demuxer_desc_audio = {
"Audio demuxer",
"audio",
"Audio file",
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c
index db2a31fe53..e636383272 100644
--- a/libmpdemux/demux_avi.c
+++ b/libmpdemux/demux_avi.c
@@ -17,8 +17,8 @@
extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer);
extern int demux_ogg_open(demuxer_t* demuxer);
-extern demuxer_desc_t demuxer_desc_avi_ni;
-extern demuxer_desc_t demuxer_desc_avi_nini;
+extern const demuxer_desc_t demuxer_desc_avi_ni;
+extern const demuxer_desc_t demuxer_desc_avi_nini;
// PTS: 0=interleaved 1=BPS-based
int pts_from_bps=1;
@@ -851,7 +851,7 @@ static demuxer_t* demux_open_hack_avi(demuxer_t *demuxer)
}
-demuxer_desc_t demuxer_desc_avi = {
+const demuxer_desc_t demuxer_desc_avi = {
"AVI demuxer",
"avi",
"AVI",
@@ -867,7 +867,7 @@ demuxer_desc_t demuxer_desc_avi = {
demux_avi_control
};
-demuxer_desc_t demuxer_desc_avi_ni = {
+const demuxer_desc_t demuxer_desc_avi_ni = {
"AVI demuxer, non-interleaved",
"avini",
"AVI",
@@ -883,7 +883,7 @@ demuxer_desc_t demuxer_desc_avi_ni = {
demux_avi_control
};
-demuxer_desc_t demuxer_desc_avi_nini = {
+const demuxer_desc_t demuxer_desc_avi_nini = {
"AVI demuxer, non-interleaved and no index",
"avinini",
"AVI",
diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c
index 81c76ec4c6..51d14f0d1f 100644
--- a/libmpdemux/demux_avs.c
+++ b/libmpdemux/demux_avs.c
@@ -462,7 +462,7 @@ static int avs_check_file(demuxer_t *demuxer)
}
-demuxer_desc_t demuxer_desc_avs = {
+const demuxer_desc_t demuxer_desc_avs = {
"Avisynth demuxer",
"avs",
"AVS",
diff --git a/libmpdemux/demux_demuxers.c b/libmpdemux/demux_demuxers.c
index 1edd1429cb..8632c0cf31 100644
--- a/libmpdemux/demux_demuxers.c
+++ b/libmpdemux/demux_demuxers.c
@@ -15,7 +15,7 @@ typedef struct dd_priv {
demuxer_t* sd;
} dd_priv_t;
-extern demuxer_desc_t demuxer_desc_demuxers;
+extern const demuxer_desc_t demuxer_desc_demuxers;
demuxer_t* new_demuxers_demuxer(demuxer_t* vd, demuxer_t* ad, demuxer_t* sd) {
demuxer_t* ret;
@@ -125,7 +125,7 @@ static int demux_demuxers_control(demuxer_t *demuxer,int cmd, void *arg){
return DEMUXER_CTRL_NOTIMPL;
}
-demuxer_desc_t demuxer_desc_demuxers = {
+const demuxer_desc_t demuxer_desc_demuxers = {
"Demuxers demuxer",
"", // Not selectable
"",
diff --git a/libmpdemux/demux_film.c b/libmpdemux/demux_film.c
index fe2c287001..65656dd533 100644
--- a/libmpdemux/demux_film.c
+++ b/libmpdemux/demux_film.c
@@ -460,7 +460,7 @@ static int film_check_file(demuxer_t* demuxer)
}
-demuxer_desc_t demuxer_desc_film = {
+const demuxer_desc_t demuxer_desc_film = {
"FILM/CPK demuxer for Sega Saturn CD-ROM games",
"film",
"FILM",
diff --git a/libmpdemux/demux_fli.c b/libmpdemux/demux_fli.c
index a8f13492c2..56a427eb11 100644
--- a/libmpdemux/demux_fli.c
+++ b/libmpdemux/demux_fli.c
@@ -199,7 +199,7 @@ static int fli_check_file(demuxer_t* demuxer)
}
-demuxer_desc_t demuxer_desc_fli = {
+const demuxer_desc_t demuxer_desc_fli = {
"Autodesk FLIC demuxer",
"fli",
"FLI",
diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c
index 13dbfb5365..99135db0c8 100644
--- a/libmpdemux/demux_gif.c
+++ b/libmpdemux/demux_gif.c
@@ -289,7 +289,7 @@ static void demux_close_gif(demuxer_t* demuxer)
}
-demuxer_desc_t demuxer_desc_gif = {
+const demuxer_desc_t demuxer_desc_gif = {
"GIF demuxer",
"gif",
"GIF",
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 05b1f146a5..f906f66887 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -783,7 +783,7 @@ static void demux_close_lavf(demuxer_t *demuxer)
}
-demuxer_desc_t demuxer_desc_lavf = {
+const demuxer_desc_t demuxer_desc_lavf = {
"libavformat demuxer",
"lavf",
"libavformat",
@@ -799,7 +799,7 @@ demuxer_desc_t demuxer_desc_lavf = {
demux_lavf_control
};
-demuxer_desc_t demuxer_desc_lavf_preferred = {
+const demuxer_desc_t demuxer_desc_lavf_preferred = {
"libavformat preferred demuxer",
"lavfpref",
"libavformat",
diff --git a/libmpdemux/demux_lmlm4.c b/libmpdemux/demux_lmlm4.c
index 84bca8731d..2ab335d452 100644
--- a/libmpdemux/demux_lmlm4.c
+++ b/libmpdemux/demux_lmlm4.c
@@ -352,7 +352,7 @@ static void demux_close_lmlm4(demuxer_t *demuxer)
}
-demuxer_desc_t demuxer_desc_lmlm4 = {
+const demuxer_desc_t demuxer_desc_lmlm4 = {
"LMLM4 MPEG4 Compression Card stream demuxer",
"lmlm4",
"RAW LMLM4",
diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c
index 38e90484bf..75560c6719 100644
--- a/libmpdemux/demux_mf.c
+++ b/libmpdemux/demux_mf.c
@@ -172,7 +172,7 @@ static int demux_control_mf(demuxer_t *demuxer, int cmd, void *arg) {
}
}
-demuxer_desc_t demuxer_desc_mf = {
+const demuxer_desc_t demuxer_desc_mf = {
"mf demuxer",
"mf",
"MF",
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 5e802711c0..867dfd2f8a 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -3536,7 +3536,7 @@ demux_mkv_get_audio_lang(demuxer_t *demuxer, int track_num, char *lang,
}
-demuxer_desc_t demuxer_desc_matroska = {
+const demuxer_desc_t demuxer_desc_matroska = {
"Matroska demuxer",
"mkv",
"Matroska",
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index 34ca6f4f90..73348ea084 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -2313,7 +2313,7 @@ static int demux_mov_control(demuxer_t *demuxer, int cmd, void *arg){
}
-demuxer_desc_t demuxer_desc_mov = {
+const demuxer_desc_t demuxer_desc_mov = {
"Quicktime/MP4 demuxer",
"mov",
"Quicktime/MOV",
diff --git a/libmpdemux/demux_mpc.c b/libmpdemux/demux_mpc.c
index 5f18d405f7..323d2a15fe 100644
--- a/libmpdemux/demux_mpc.c
+++ b/libmpdemux/demux_mpc.c
@@ -203,7 +203,7 @@ static int demux_mpc_control(demuxer_t *demuxer,int cmd, void *arg){
}
-demuxer_desc_t demuxer_desc_mpc = {
+const demuxer_desc_t demuxer_desc_mpc = {
"Musepack demuxer",
"mpc",
"MPC",
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c
index 45dfec1af4..ab9ef5ce96 100644
--- a/libmpdemux/demux_mpg.c
+++ b/libmpdemux/demux_mpg.c
@@ -1125,7 +1125,7 @@ static demuxer_t* demux_mpg_ps_open(demuxer_t* demuxer)
}
-demuxer_desc_t demuxer_desc_mpeg_ps = {
+const demuxer_desc_t demuxer_desc_mpeg_ps = {
"MPEG PS demuxer",
"mpegps",
"MPEG-PS",
@@ -1142,7 +1142,7 @@ demuxer_desc_t demuxer_desc_mpeg_ps = {
};
-demuxer_desc_t demuxer_desc_mpeg_pes = {
+const demuxer_desc_t demuxer_desc_mpeg_pes = {
"MPEG PES demuxer",
"mpegpes",
"MPEG-PES",
@@ -1159,7 +1159,7 @@ demuxer_desc_t demuxer_desc_mpeg_pes = {
};
-demuxer_desc_t demuxer_desc_mpeg_gxf = {
+const demuxer_desc_t demuxer_desc_mpeg_gxf = {
"MPEG ES in GXF demuxer",
"mpeggxf",
"MPEG-ES in GXF",
@@ -1175,7 +1175,7 @@ demuxer_desc_t demuxer_desc_mpeg_gxf = {
NULL
};
-demuxer_desc_t demuxer_desc_mpeg_es = {
+const demuxer_desc_t demuxer_desc_mpeg_es = {
"MPEG ES demuxer",
"mpeges",
"MPEG-ES",
@@ -1192,7 +1192,7 @@ demuxer_desc_t demuxer_desc_mpeg_es = {
};
-demuxer_desc_t demuxer_desc_mpeg4_es = {
+const demuxer_desc_t demuxer_desc_mpeg4_es = {
"MPEG4 ES demuxer",
"mpeg4es",
"MPEG-ES",
@@ -1209,7 +1209,7 @@ demuxer_desc_t demuxer_desc_mpeg4_es = {
};
-demuxer_desc_t demuxer_desc_h264_es = {
+const demuxer_desc_t demuxer_desc_h264_es = {
"H.264 ES demuxer",
"h264es",
"H264-ES",
diff --git a/libmpdemux/demux_nemesi.c b/libmpdemux/demux_nemesi.c
index c145489bda..b84c63b486 100644
--- a/libmpdemux/demux_nemesi.c
+++ b/libmpdemux/demux_nemesi.c
@@ -488,7 +488,7 @@ static int demux_rtp_control(struct demuxer_st *demuxer, int cmd, void *arg)
}
}
-demuxer_desc_t demuxer_desc_rtp_nemesi = {
+const demuxer_desc_t demuxer_desc_rtp_nemesi = {
"libnemesi RTP demuxer",
"nemesi",
"",
diff --git a/libmpdemux/demux_nsv.c b/libmpdemux/demux_nsv.c
index ec33487874..bec351e44e 100644
--- a/libmpdemux/demux_nsv.c
+++ b/libmpdemux/demux_nsv.c
@@ -315,7 +315,7 @@ static void demux_close_nsv(demuxer_t* demuxer) {
}
-demuxer_desc_t demuxer_desc_nsv = {
+const demuxer_desc_t demuxer_desc_nsv = {
"NullsoftVideo demuxer",
"nsv",
"Nullsoft Streaming Video",
diff --git a/libmpdemux/demux_nut.c b/libmpdemux/demux_nut.c
index edec709831..4cf4e6c1b3 100644
--- a/libmpdemux/demux_nut.c
+++ b/libmpdemux/demux_nut.c
@@ -292,7 +292,7 @@ static void demux_close_nut(demuxer_t *demuxer) {
}
-demuxer_desc_t demuxer_desc_nut = {
+const demuxer_desc_t demuxer_desc_nut = {
"NUT demuxer",
"nut",
"libnut",
diff --git a/libmpdemux/demux_nuv.c b/libmpdemux/demux_nuv.c
index 5e33412d93..94112c3874 100644
--- a/libmpdemux/demux_nuv.c
+++ b/libmpdemux/demux_nuv.c
@@ -443,7 +443,7 @@ static void demux_close_nuv(demuxer_t* demuxer) {
}
-demuxer_desc_t demuxer_desc_nuv = {
+const demuxer_desc_t demuxer_desc_nuv = {
"NuppelVideo demuxer",
"nuv",
"NuppelVideo",
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index 691d913775..9cde771a1b 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -1568,7 +1568,7 @@ static int demux_ogg_control(demuxer_t *demuxer,int cmd, void *arg){
-demuxer_desc_t demuxer_desc_ogg = {
+const demuxer_desc_t demuxer_desc_ogg = {
"Ogg demuxer",
"ogg",
"Ogg",
diff --git a/libmpdemux/demux_pva.c b/libmpdemux/demux_pva.c
index 6a9762b652..15301c0a59 100644
--- a/libmpdemux/demux_pva.c
+++ b/libmpdemux/demux_pva.c
@@ -514,7 +514,7 @@ static void demux_close_pva(demuxer_t * demuxer)
}
-demuxer_desc_t demuxer_desc_pva = {
+const demuxer_desc_t demuxer_desc_pva = {
"PVA demuxer",
"pva",
"PVA",
diff --git a/libmpdemux/demux_rawaudio.c b/libmpdemux/demux_rawaudio.c
index 8c08f73467..a525a75f57 100644
--- a/libmpdemux/demux_rawaudio.c
+++ b/libmpdemux/demux_rawaudio.c
@@ -96,7 +96,7 @@ static void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,float aud
}
-demuxer_desc_t demuxer_desc_rawaudio = {
+const demuxer_desc_t demuxer_desc_rawaudio = {
"Raw audio demuxer",
"rawaudio",
"rawaudio",
diff --git a/libmpdemux/demux_rawdv.c b/libmpdemux/demux_rawdv.c
index ce2e87a2cb..948d2386f0 100644
--- a/libmpdemux/demux_rawdv.c
+++ b/libmpdemux/demux_rawdv.c
@@ -248,7 +248,7 @@ static int demux_rawdv_control(demuxer_t *demuxer,int cmd, void *arg) {
}
-demuxer_desc_t demuxer_desc_rawdv = {
+const demuxer_desc_t demuxer_desc_rawdv = {
"Raw DV demuxer",
"rawdv",
"RAWDV",
diff --git a/libmpdemux/demux_rawvideo.c b/libmpdemux/demux_rawvideo.c
index 28bf43022d..170955a3d2 100644
--- a/libmpdemux/demux_rawvideo.c
+++ b/libmpdemux/demux_rawvideo.c
@@ -139,7 +139,7 @@ static void demux_rawvideo_seek(demuxer_t *demuxer,float rel_seek_secs,float aud
}
-demuxer_desc_t demuxer_desc_rawvideo = {
+const demuxer_desc_t demuxer_desc_rawvideo = {
"Raw video demuxer",
"rawvideo",
"rawvideo",
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index fe7877e14f..0efb0450c3 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -1908,7 +1908,7 @@ static int demux_real_control(demuxer_t *demuxer, int cmd, void *arg)
}
-demuxer_desc_t demuxer_desc_real = {
+const demuxer_desc_t demuxer_desc_real = {
"Realmedia demuxer",
"real",
"REAL",
diff --git a/libmpdemux/demux_realaud.c b/libmpdemux/demux_realaud.c
index 7d05c09d79..eedaf1e135 100644
--- a/libmpdemux/demux_realaud.c
+++ b/libmpdemux/demux_realaud.c
@@ -350,7 +350,7 @@ int demux_seek_ra(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, in
#endif
-demuxer_desc_t demuxer_desc_realaudio = {
+const demuxer_desc_t demuxer_desc_realaudio = {
"Realaudio demuxer",
"realaudio",
"REALAUDIO",
diff --git a/libmpdemux/demux_roq.c b/libmpdemux/demux_roq.c
index 7b80edbb6c..fac1985f0a 100644
--- a/libmpdemux/demux_roq.c
+++ b/libmpdemux/demux_roq.c
@@ -249,7 +249,7 @@ static void demux_close_roq(demuxer_t* demuxer) {
}
-demuxer_desc_t demuxer_desc_roq = {
+const demuxer_desc_t demuxer_desc_roq = {
"RoQ demuxer",
"roq",
"ROQ",
diff --git a/libmpdemux/demux_smjpeg.c b/libmpdemux/demux_smjpeg.c
index 7637bf2fa5..7d88865e47 100644
--- a/libmpdemux/demux_smjpeg.c
+++ b/libmpdemux/demux_smjpeg.c
@@ -172,7 +172,7 @@ static void demux_close_smjpeg(demuxer_t *demuxer)
}
-demuxer_desc_t demuxer_desc_smjpeg = {
+const demuxer_desc_t demuxer_desc_smjpeg = {
"smjpeg demuxer",
"smjpeg",
"SMJPEG",
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index 8a70d2e84c..92c5b0e848 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -3357,7 +3357,7 @@ static int demux_ts_control(demuxer_t *demuxer, int cmd, void *arg)
}
-demuxer_desc_t demuxer_desc_mpeg_ts = {
+const demuxer_desc_t demuxer_desc_mpeg_ts = {
"MPEG-TS demuxer",
"mpegts",
"TS",
diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c
index 38f5b1877b..5cdb78410f 100644
--- a/libmpdemux/demux_ty.c
+++ b/libmpdemux/demux_ty.c
@@ -881,7 +881,7 @@ static demuxer_t* demux_open_ty(demuxer_t* demuxer)
}
-demuxer_desc_t demuxer_desc_mpeg_ty = {
+const demuxer_desc_t demuxer_desc_mpeg_ty = {
"TiVo demuxer",
"tivo",
"TiVo",
diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c
index f9d2a0daae..7c14a989bf 100644
--- a/libmpdemux/demux_viv.c
+++ b/libmpdemux/demux_viv.c
@@ -749,7 +749,7 @@ static void demux_close_vivo(demuxer_t *demuxer)
}
-demuxer_desc_t demuxer_desc_vivo = {
+const demuxer_desc_t demuxer_desc_vivo = {
"Vivo demuxer",
"vivo",
"VIVO",
diff --git a/libmpdemux/demux_vqf.c b/libmpdemux/demux_vqf.c
index b7f071a849..dae9daabc0 100644
--- a/libmpdemux/demux_vqf.c
+++ b/libmpdemux/demux_vqf.c
@@ -200,7 +200,7 @@ static void demux_seek_vqf(demuxer_t *demuxer,float rel_seek_secs,float audio_de
static void demux_close_vqf(demuxer_t* demuxer) {}
-demuxer_desc_t demuxer_desc_vqf = {
+const demuxer_desc_t demuxer_desc_vqf = {
"TwinVQ demuxer",
"vqf",
"VQF",
diff --git a/libmpdemux/demux_xmms.c b/libmpdemux/demux_xmms.c
index 2617ed962b..d9347c7881 100644
--- a/libmpdemux/demux_xmms.c
+++ b/libmpdemux/demux_xmms.c
@@ -399,7 +399,7 @@ static int demux_xmms_control(demuxer_t *demuxer,int cmd, void *arg){
}
-demuxer_desc_t demuxer_desc_xmms = {
+const demuxer_desc_t demuxer_desc_xmms = {
"XMMS demuxer",
"xmms",
"XMMS",
diff --git a/libmpdemux/demux_y4m.c b/libmpdemux/demux_y4m.c
index 38d74f83c2..4479a36ff3 100644
--- a/libmpdemux/demux_y4m.c
+++ b/libmpdemux/demux_y4m.c
@@ -271,7 +271,7 @@ static void demux_close_y4m(demuxer_t *demuxer)
}
-demuxer_desc_t demuxer_desc_y4m = {
+const demuxer_desc_t demuxer_desc_y4m = {
"YUV4MPEG2 demuxer",
"y4m",
"YUV4MPEG2",
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 560fbc8cdd..8b21f6bc7e 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -31,48 +31,48 @@ extern void resync_video_stream(sh_video_t *sh_video);
extern void resync_audio_stream(sh_audio_t *sh_audio);
// Demuxer list
-extern demuxer_desc_t demuxer_desc_rawaudio;
-extern demuxer_desc_t demuxer_desc_rawvideo;
-extern demuxer_desc_t demuxer_desc_tv;
-extern demuxer_desc_t demuxer_desc_mf;
-extern demuxer_desc_t demuxer_desc_avi;
-extern demuxer_desc_t demuxer_desc_y4m;
-extern demuxer_desc_t demuxer_desc_asf;
-extern demuxer_desc_t demuxer_desc_nuv;
-extern demuxer_desc_t demuxer_desc_real;
-extern demuxer_desc_t demuxer_desc_smjpeg;
-extern demuxer_desc_t demuxer_desc_matroska;
-extern demuxer_desc_t demuxer_desc_realaudio;
-extern demuxer_desc_t demuxer_desc_vqf;
-extern demuxer_desc_t demuxer_desc_mov;
-extern demuxer_desc_t demuxer_desc_vivo;
-extern demuxer_desc_t demuxer_desc_fli;
-extern demuxer_desc_t demuxer_desc_film;
-extern demuxer_desc_t demuxer_desc_roq;
-extern demuxer_desc_t demuxer_desc_gif;
-extern demuxer_desc_t demuxer_desc_ogg;
-extern demuxer_desc_t demuxer_desc_avs;
-extern demuxer_desc_t demuxer_desc_pva;
-extern demuxer_desc_t demuxer_desc_nsv;
-extern demuxer_desc_t demuxer_desc_mpeg_ts;
-extern demuxer_desc_t demuxer_desc_lmlm4;
-extern demuxer_desc_t demuxer_desc_mpeg_ps;
-extern demuxer_desc_t demuxer_desc_mpeg_pes;
-extern demuxer_desc_t demuxer_desc_mpeg_es;
-extern demuxer_desc_t demuxer_desc_mpeg_gxf;
-extern demuxer_desc_t demuxer_desc_mpeg4_es;
-extern demuxer_desc_t demuxer_desc_h264_es;
-extern demuxer_desc_t demuxer_desc_rawdv;
-extern demuxer_desc_t demuxer_desc_mpc;
-extern demuxer_desc_t demuxer_desc_audio;
-extern demuxer_desc_t demuxer_desc_xmms;
-extern demuxer_desc_t demuxer_desc_mpeg_ty;
-extern demuxer_desc_t demuxer_desc_rtp;
-extern demuxer_desc_t demuxer_desc_rtp_nemesi;
-extern demuxer_desc_t demuxer_desc_lavf;
-extern demuxer_desc_t demuxer_desc_lavf_preferred;
-extern demuxer_desc_t demuxer_desc_aac;
-extern demuxer_desc_t demuxer_desc_nut;
+extern const demuxer_desc_t demuxer_desc_rawaudio;
+extern const demuxer_desc_t demuxer_desc_rawvideo;
+extern const demuxer_desc_t demuxer_desc_tv;
+extern const demuxer_desc_t demuxer_desc_mf;
+extern const demuxer_desc_t demuxer_desc_avi;
+extern const demuxer_desc_t demuxer_desc_y4m;
+extern const demuxer_desc_t demuxer_desc_asf;
+extern const demuxer_desc_t demuxer_desc_nuv;
+extern const demuxer_desc_t demuxer_desc_real;
+extern const demuxer_desc_t demuxer_desc_smjpeg;
+extern const demuxer_desc_t demuxer_desc_matroska;
+extern const demuxer_desc_t demuxer_desc_realaudio;
+extern const demuxer_desc_t demuxer_desc_vqf;
+extern const demuxer_desc_t demuxer_desc_mov;
+extern const demuxer_desc_t demuxer_desc_vivo;
+extern const demuxer_desc_t demuxer_desc_fli;
+extern const demuxer_desc_t demuxer_desc_film;
+extern const demuxer_desc_t demuxer_desc_roq;
+extern const demuxer_desc_t demuxer_desc_gif;
+extern const demuxer_desc_t demuxer_desc_ogg;
+extern const demuxer_desc_t demuxer_desc_avs;
+extern const demuxer_desc_t demuxer_desc_pva;
+extern const demuxer_desc_t demuxer_desc_nsv;
+extern const demuxer_desc_t demuxer_desc_mpeg_ts;
+extern const demuxer_desc_t demuxer_desc_lmlm4;
+extern const demuxer_desc_t demuxer_desc_mpeg_ps;
+extern const demuxer_desc_t demuxer_desc_mpeg_pes;
+extern const demuxer_desc_t demuxer_desc_mpeg_es;
+extern const demuxer_desc_t demuxer_desc_mpeg_gxf;
+extern const demuxer_desc_t demuxer_desc_mpeg4_es;
+extern const demuxer_desc_t demuxer_desc_h264_es;
+extern const demuxer_desc_t demuxer_desc_rawdv;
+extern const demuxer_desc_t demuxer_desc_mpc;
+extern const demuxer_desc_t demuxer_desc_audio;
+extern const demuxer_desc_t demuxer_desc_xmms;
+extern const demuxer_desc_t demuxer_desc_mpeg_ty;
+extern const demuxer_desc_t demuxer_desc_rtp;
+extern const demuxer_desc_t demuxer_desc_rtp_nemesi;
+extern const demuxer_desc_t demuxer_desc_lavf;
+extern const demuxer_desc_t demuxer_desc_lavf_preferred;
+extern const demuxer_desc_t demuxer_desc_aac;
+extern const demuxer_desc_t demuxer_desc_nut;
const demuxer_desc_t* const demuxer_list[] = {
&demuxer_desc_rawaudio,