Author: reimar Date: Sun Jan 13 17:00:39 2008 New Revision: 25735 Log: Make all demuxer_desc_t const, thus moving them to .rodata Modified: trunk/libmpdemux/demux_aac.c trunk/libmpdemux/demux_asf.c trunk/libmpdemux/demux_audio.c trunk/libmpdemux/demux_avi.c trunk/libmpdemux/demux_avs.c trunk/libmpdemux/demux_demuxers.c trunk/libmpdemux/demux_film.c trunk/libmpdemux/demux_fli.c trunk/libmpdemux/demux_gif.c trunk/libmpdemux/demux_lavf.c trunk/libmpdemux/demux_lmlm4.c trunk/libmpdemux/demux_mf.c trunk/libmpdemux/demux_mkv.c trunk/libmpdemux/demux_mov.c trunk/libmpdemux/demux_mpc.c trunk/libmpdemux/demux_mpg.c trunk/libmpdemux/demux_nemesi.c trunk/libmpdemux/demux_nsv.c trunk/libmpdemux/demux_nut.c trunk/libmpdemux/demux_nuv.c trunk/libmpdemux/demux_ogg.c trunk/libmpdemux/demux_pva.c trunk/libmpdemux/demux_rawaudio.c trunk/libmpdemux/demux_rawdv.c trunk/libmpdemux/demux_rawvideo.c trunk/libmpdemux/demux_real.c trunk/libmpdemux/demux_realaud.c trunk/libmpdemux/demux_roq.c trunk/libmpdemux/demux_smjpeg.c trunk/libmpdemux/demux_ts.c trunk/libmpdemux/demux_ty.c trunk/libmpdemux/demux_viv.c trunk/libmpdemux/demux_vqf.c trunk/libmpdemux/demux_xmms.c trunk/libmpdemux/demux_y4m.c trunk/libmpdemux/demuxer.c Modified: trunk/libmpdemux/demux_aac.c ============================================================================== --- trunk/libmpdemux/demux_aac.c (original) +++ trunk/libmpdemux/demux_aac.c Sun Jan 13 17:00:39 2008 @@ -250,7 +250,7 @@ static void demux_aac_seek(demuxer_t *de } -demuxer_desc_t demuxer_desc_aac = { +const demuxer_desc_t demuxer_desc_aac = { "AAC demuxer", "aac", "AAC", Modified: trunk/libmpdemux/demux_asf.c ============================================================================== --- trunk/libmpdemux/demux_asf.c (original) +++ trunk/libmpdemux/demux_asf.c Sun Jan 13 17:00:39 2008 @@ -645,7 +645,7 @@ static void demux_close_asf(demuxer_t *d free(asf); } -demuxer_desc_t demuxer_desc_asf = { +const demuxer_desc_t demuxer_desc_asf = { "ASF demuxer", "asf", "ASF", Modified: trunk/libmpdemux/demux_audio.c ============================================================================== --- trunk/libmpdemux/demux_audio.c (original) +++ trunk/libmpdemux/demux_audio.c Sun Jan 13 17:00:39 2008 @@ -712,7 +712,7 @@ static int demux_audio_control(demuxer_t } -demuxer_desc_t demuxer_desc_audio = { +const demuxer_desc_t demuxer_desc_audio = { "Audio demuxer", "audio", "Audio file", Modified: trunk/libmpdemux/demux_avi.c ============================================================================== --- trunk/libmpdemux/demux_avi.c (original) +++ trunk/libmpdemux/demux_avi.c Sun Jan 13 17:00:39 2008 @@ -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(de } -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", Modified: trunk/libmpdemux/demux_avs.c ============================================================================== --- trunk/libmpdemux/demux_avs.c (original) +++ trunk/libmpdemux/demux_avs.c Sun Jan 13 17:00:39 2008 @@ -462,7 +462,7 @@ static int avs_check_file(demuxer_t *dem } -demuxer_desc_t demuxer_desc_avs = { +const demuxer_desc_t demuxer_desc_avs = { "Avisynth demuxer", "avs", "AVS", Modified: trunk/libmpdemux/demux_demuxers.c ============================================================================== --- trunk/libmpdemux/demux_demuxers.c (original) +++ trunk/libmpdemux/demux_demuxers.c Sun Jan 13 17:00:39 2008 @@ -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(demuxe return DEMUXER_CTRL_NOTIMPL; } -demuxer_desc_t demuxer_desc_demuxers = { +const demuxer_desc_t demuxer_desc_demuxers = { "Demuxers demuxer", "", // Not selectable "", Modified: trunk/libmpdemux/demux_film.c ============================================================================== --- trunk/libmpdemux/demux_film.c (original) +++ trunk/libmpdemux/demux_film.c Sun Jan 13 17:00:39 2008 @@ -460,7 +460,7 @@ static int film_check_file(demuxer_t* de } -demuxer_desc_t demuxer_desc_film = { +const demuxer_desc_t demuxer_desc_film = { "FILM/CPK demuxer for Sega Saturn CD-ROM games", "film", "FILM", Modified: trunk/libmpdemux/demux_fli.c ============================================================================== --- trunk/libmpdemux/demux_fli.c (original) +++ trunk/libmpdemux/demux_fli.c Sun Jan 13 17:00:39 2008 @@ -199,7 +199,7 @@ static int fli_check_file(demuxer_t* dem } -demuxer_desc_t demuxer_desc_fli = { +const demuxer_desc_t demuxer_desc_fli = { "Autodesk FLIC demuxer", "fli", "FLI", Modified: trunk/libmpdemux/demux_gif.c ============================================================================== --- trunk/libmpdemux/demux_gif.c (original) +++ trunk/libmpdemux/demux_gif.c Sun Jan 13 17:00:39 2008 @@ -289,7 +289,7 @@ static void demux_close_gif(demuxer_t* d } -demuxer_desc_t demuxer_desc_gif = { +const demuxer_desc_t demuxer_desc_gif = { "GIF demuxer", "gif", "GIF", Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c (original) +++ trunk/libmpdemux/demux_lavf.c Sun Jan 13 17:00:39 2008 @@ -783,7 +783,7 @@ static void demux_close_lavf(demuxer_t * } -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", Modified: trunk/libmpdemux/demux_lmlm4.c ============================================================================== --- trunk/libmpdemux/demux_lmlm4.c (original) +++ trunk/libmpdemux/demux_lmlm4.c Sun Jan 13 17:00:39 2008 @@ -352,7 +352,7 @@ static void demux_close_lmlm4(demuxer_t } -demuxer_desc_t demuxer_desc_lmlm4 = { +const demuxer_desc_t demuxer_desc_lmlm4 = { "LMLM4 MPEG4 Compression Card stream demuxer", "lmlm4", "RAW LMLM4", Modified: trunk/libmpdemux/demux_mf.c ============================================================================== --- trunk/libmpdemux/demux_mf.c (original) +++ trunk/libmpdemux/demux_mf.c Sun Jan 13 17:00:39 2008 @@ -172,7 +172,7 @@ static int demux_control_mf(demuxer_t *d } } -demuxer_desc_t demuxer_desc_mf = { +const demuxer_desc_t demuxer_desc_mf = { "mf demuxer", "mf", "MF", Modified: trunk/libmpdemux/demux_mkv.c ============================================================================== --- trunk/libmpdemux/demux_mkv.c (original) +++ trunk/libmpdemux/demux_mkv.c Sun Jan 13 17:00:39 2008 @@ -3536,7 +3536,7 @@ demux_mkv_get_audio_lang(demuxer_t *demu } -demuxer_desc_t demuxer_desc_matroska = { +const demuxer_desc_t demuxer_desc_matroska = { "Matroska demuxer", "mkv", "Matroska", Modified: trunk/libmpdemux/demux_mov.c ============================================================================== --- trunk/libmpdemux/demux_mov.c (original) +++ trunk/libmpdemux/demux_mov.c Sun Jan 13 17:00:39 2008 @@ -2313,7 +2313,7 @@ static int demux_mov_control(demuxer_t * } -demuxer_desc_t demuxer_desc_mov = { +const demuxer_desc_t demuxer_desc_mov = { "Quicktime/MP4 demuxer", "mov", "Quicktime/MOV", Modified: trunk/libmpdemux/demux_mpc.c ============================================================================== --- trunk/libmpdemux/demux_mpc.c (original) +++ trunk/libmpdemux/demux_mpc.c Sun Jan 13 17:00:39 2008 @@ -203,7 +203,7 @@ static int demux_mpc_control(demuxer_t * } -demuxer_desc_t demuxer_desc_mpc = { +const demuxer_desc_t demuxer_desc_mpc = { "Musepack demuxer", "mpc", "MPC", Modified: trunk/libmpdemux/demux_mpg.c ============================================================================== --- trunk/libmpdemux/demux_mpg.c (original) +++ trunk/libmpdemux/demux_mpg.c Sun Jan 13 17:00:39 2008 @@ -1125,7 +1125,7 @@ static demuxer_t* demux_mpg_ps_open(demu } -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", Modified: trunk/libmpdemux/demux_nemesi.c ============================================================================== --- trunk/libmpdemux/demux_nemesi.c (original) +++ trunk/libmpdemux/demux_nemesi.c Sun Jan 13 17:00:39 2008 @@ -488,7 +488,7 @@ static int demux_rtp_control(struct demu } } -demuxer_desc_t demuxer_desc_rtp_nemesi = { +const demuxer_desc_t demuxer_desc_rtp_nemesi = { "libnemesi RTP demuxer", "nemesi", "", Modified: trunk/libmpdemux/demux_nsv.c ============================================================================== --- trunk/libmpdemux/demux_nsv.c (original) +++ trunk/libmpdemux/demux_nsv.c Sun Jan 13 17:00:39 2008 @@ -315,7 +315,7 @@ static void demux_close_nsv(demuxer_t* d } -demuxer_desc_t demuxer_desc_nsv = { +const demuxer_desc_t demuxer_desc_nsv = { "NullsoftVideo demuxer", "nsv", "Nullsoft Streaming Video", Modified: trunk/libmpdemux/demux_nut.c ============================================================================== --- trunk/libmpdemux/demux_nut.c (original) +++ trunk/libmpdemux/demux_nut.c Sun Jan 13 17:00:39 2008 @@ -292,7 +292,7 @@ static void demux_close_nut(demuxer_t *d } -demuxer_desc_t demuxer_desc_nut = { +const demuxer_desc_t demuxer_desc_nut = { "NUT demuxer", "nut", "libnut", Modified: trunk/libmpdemux/demux_nuv.c ============================================================================== --- trunk/libmpdemux/demux_nuv.c (original) +++ trunk/libmpdemux/demux_nuv.c Sun Jan 13 17:00:39 2008 @@ -443,7 +443,7 @@ static void demux_close_nuv(demuxer_t* d } -demuxer_desc_t demuxer_desc_nuv = { +const demuxer_desc_t demuxer_desc_nuv = { "NuppelVideo demuxer", "nuv", "NuppelVideo", Modified: trunk/libmpdemux/demux_ogg.c ============================================================================== --- trunk/libmpdemux/demux_ogg.c (original) +++ trunk/libmpdemux/demux_ogg.c Sun Jan 13 17:00:39 2008 @@ -1568,7 +1568,7 @@ static int demux_ogg_control(demuxer_t * -demuxer_desc_t demuxer_desc_ogg = { +const demuxer_desc_t demuxer_desc_ogg = { "Ogg demuxer", "ogg", "Ogg", Modified: trunk/libmpdemux/demux_pva.c ============================================================================== --- trunk/libmpdemux/demux_pva.c (original) +++ trunk/libmpdemux/demux_pva.c Sun Jan 13 17:00:39 2008 @@ -514,7 +514,7 @@ static void demux_close_pva(demuxer_t * } -demuxer_desc_t demuxer_desc_pva = { +const demuxer_desc_t demuxer_desc_pva = { "PVA demuxer", "pva", "PVA", Modified: trunk/libmpdemux/demux_rawaudio.c ============================================================================== --- trunk/libmpdemux/demux_rawaudio.c (original) +++ trunk/libmpdemux/demux_rawaudio.c Sun Jan 13 17:00:39 2008 @@ -96,7 +96,7 @@ static void demux_rawaudio_seek(demuxer_ } -demuxer_desc_t demuxer_desc_rawaudio = { +const demuxer_desc_t demuxer_desc_rawaudio = { "Raw audio demuxer", "rawaudio", "rawaudio", Modified: trunk/libmpdemux/demux_rawdv.c ============================================================================== --- trunk/libmpdemux/demux_rawdv.c (original) +++ trunk/libmpdemux/demux_rawdv.c Sun Jan 13 17:00:39 2008 @@ -248,7 +248,7 @@ static int demux_rawdv_control(demuxer_t } -demuxer_desc_t demuxer_desc_rawdv = { +const demuxer_desc_t demuxer_desc_rawdv = { "Raw DV demuxer", "rawdv", "RAWDV", Modified: trunk/libmpdemux/demux_rawvideo.c ============================================================================== --- trunk/libmpdemux/demux_rawvideo.c (original) +++ trunk/libmpdemux/demux_rawvideo.c Sun Jan 13 17:00:39 2008 @@ -139,7 +139,7 @@ static void demux_rawvideo_seek(demuxer_ } -demuxer_desc_t demuxer_desc_rawvideo = { +const demuxer_desc_t demuxer_desc_rawvideo = { "Raw video demuxer", "rawvideo", "rawvideo", Modified: trunk/libmpdemux/demux_real.c ============================================================================== --- trunk/libmpdemux/demux_real.c (original) +++ trunk/libmpdemux/demux_real.c Sun Jan 13 17:00:39 2008 @@ -1908,7 +1908,7 @@ static int demux_real_control(demuxer_t } -demuxer_desc_t demuxer_desc_real = { +const demuxer_desc_t demuxer_desc_real = { "Realmedia demuxer", "real", "REAL", Modified: trunk/libmpdemux/demux_realaud.c ============================================================================== --- trunk/libmpdemux/demux_realaud.c (original) +++ trunk/libmpdemux/demux_realaud.c Sun Jan 13 17:00:39 2008 @@ -350,7 +350,7 @@ int demux_seek_ra(demuxer_t *demuxer, fl #endif -demuxer_desc_t demuxer_desc_realaudio = { +const demuxer_desc_t demuxer_desc_realaudio = { "Realaudio demuxer", "realaudio", "REALAUDIO", Modified: trunk/libmpdemux/demux_roq.c ============================================================================== --- trunk/libmpdemux/demux_roq.c (original) +++ trunk/libmpdemux/demux_roq.c Sun Jan 13 17:00:39 2008 @@ -249,7 +249,7 @@ static void demux_close_roq(demuxer_t* d } -demuxer_desc_t demuxer_desc_roq = { +const demuxer_desc_t demuxer_desc_roq = { "RoQ demuxer", "roq", "ROQ", Modified: trunk/libmpdemux/demux_smjpeg.c ============================================================================== --- trunk/libmpdemux/demux_smjpeg.c (original) +++ trunk/libmpdemux/demux_smjpeg.c Sun Jan 13 17:00:39 2008 @@ -172,7 +172,7 @@ static void demux_close_smjpeg(demuxer_t } -demuxer_desc_t demuxer_desc_smjpeg = { +const demuxer_desc_t demuxer_desc_smjpeg = { "smjpeg demuxer", "smjpeg", "SMJPEG", Modified: trunk/libmpdemux/demux_ts.c ============================================================================== --- trunk/libmpdemux/demux_ts.c (original) +++ trunk/libmpdemux/demux_ts.c Sun Jan 13 17:00:39 2008 @@ -3357,7 +3357,7 @@ static int demux_ts_control(demuxer_t *d } -demuxer_desc_t demuxer_desc_mpeg_ts = { +const demuxer_desc_t demuxer_desc_mpeg_ts = { "MPEG-TS demuxer", "mpegts", "TS", Modified: trunk/libmpdemux/demux_ty.c ============================================================================== --- trunk/libmpdemux/demux_ty.c (original) +++ trunk/libmpdemux/demux_ty.c Sun Jan 13 17:00:39 2008 @@ -881,7 +881,7 @@ static demuxer_t* demux_open_ty(demuxer_ } -demuxer_desc_t demuxer_desc_mpeg_ty = { +const demuxer_desc_t demuxer_desc_mpeg_ty = { "TiVo demuxer", "tivo", "TiVo", Modified: trunk/libmpdemux/demux_viv.c ============================================================================== --- trunk/libmpdemux/demux_viv.c (original) +++ trunk/libmpdemux/demux_viv.c Sun Jan 13 17:00:39 2008 @@ -749,7 +749,7 @@ static void demux_close_vivo(demuxer_t * } -demuxer_desc_t demuxer_desc_vivo = { +const demuxer_desc_t demuxer_desc_vivo = { "Vivo demuxer", "vivo", "VIVO", Modified: trunk/libmpdemux/demux_vqf.c ============================================================================== --- trunk/libmpdemux/demux_vqf.c (original) +++ trunk/libmpdemux/demux_vqf.c Sun Jan 13 17:00:39 2008 @@ -200,7 +200,7 @@ static void demux_seek_vqf(demuxer_t *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", Modified: trunk/libmpdemux/demux_xmms.c ============================================================================== --- trunk/libmpdemux/demux_xmms.c (original) +++ trunk/libmpdemux/demux_xmms.c Sun Jan 13 17:00:39 2008 @@ -399,7 +399,7 @@ static int demux_xmms_control(demuxer_t } -demuxer_desc_t demuxer_desc_xmms = { +const demuxer_desc_t demuxer_desc_xmms = { "XMMS demuxer", "xmms", "XMMS", Modified: trunk/libmpdemux/demux_y4m.c ============================================================================== --- trunk/libmpdemux/demux_y4m.c (original) +++ trunk/libmpdemux/demux_y4m.c Sun Jan 13 17:00:39 2008 @@ -271,7 +271,7 @@ static void demux_close_y4m(demuxer_t *d } -demuxer_desc_t demuxer_desc_y4m = { +const demuxer_desc_t demuxer_desc_y4m = { "YUV4MPEG2 demuxer", "y4m", "YUV4MPEG2", Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c (original) +++ trunk/libmpdemux/demuxer.c Sun Jan 13 17:00:39 2008 @@ -31,48 +31,48 @@ extern void resync_video_stream(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,