comparison libmpdemux/demuxer.c @ 25706:f0d45f8866e8

First step towards making all demuxer_desc_t const
author reimar
date Sun, 13 Jan 2008 15:47:24 +0000
parents aab0c3e38476
children d4fe6e23283e
comparison
equal deleted inserted replaced
25705:aab0c3e38476 25706:f0d45f8866e8
72 extern demuxer_desc_t demuxer_desc_lavf; 72 extern demuxer_desc_t demuxer_desc_lavf;
73 extern demuxer_desc_t demuxer_desc_lavf_preferred; 73 extern demuxer_desc_t demuxer_desc_lavf_preferred;
74 extern demuxer_desc_t demuxer_desc_aac; 74 extern demuxer_desc_t demuxer_desc_aac;
75 extern demuxer_desc_t demuxer_desc_nut; 75 extern demuxer_desc_t demuxer_desc_nut;
76 76
77 demuxer_desc_t* demuxer_list[] = { 77 const demuxer_desc_t* const demuxer_list[] = {
78 &demuxer_desc_rawaudio, 78 &demuxer_desc_rawaudio,
79 &demuxer_desc_rawvideo, 79 &demuxer_desc_rawvideo,
80 #ifdef USE_TV 80 #ifdef USE_TV
81 &demuxer_desc_tv, 81 &demuxer_desc_tv,
82 #endif 82 #endif
180 * Get demuxer description structure for a given demuxer type 180 * Get demuxer description structure for a given demuxer type
181 * 181 *
182 * @param file_format type of the demuxer 182 * @param file_format type of the demuxer
183 * @return structure for the demuxer, NULL if not found 183 * @return structure for the demuxer, NULL if not found
184 */ 184 */
185 static demuxer_desc_t* get_demuxer_desc_from_type(int file_format) 185 static const demuxer_desc_t* get_demuxer_desc_from_type(int file_format)
186 { 186 {
187 int i; 187 int i;
188 188
189 for (i = 0; demuxer_list[i]; i++) 189 for (i = 0; demuxer_list[i]; i++)
190 if (file_format == demuxer_list[i]->type) 190 if (file_format == demuxer_list[i]->type)
699 699
700 demuxer_t *demuxer=NULL; 700 demuxer_t *demuxer=NULL;
701 701
702 sh_video_t *sh_video=NULL; 702 sh_video_t *sh_video=NULL;
703 703
704 demuxer_desc_t *demuxer_desc; 704 const demuxer_desc_t *demuxer_desc;
705 int fformat = 0; 705 int fformat = 0;
706 int i; 706 int i;
707 707
708 //printf("demux_open(%p,%d,%d,%d,%d) \n",stream,file_format,audio_id,video_id,dvdsub_id); 708 //printf("demux_open(%p,%d,%d,%d,%d) \n",stream,file_format,audio_id,video_id,dvdsub_id);
709 709