comparison libmpdemux/demux_ogg.c @ 25495:5cbf0cbeef7c

Add some const/static qualifiers as appropriate
author reimar
date Mon, 24 Dec 2007 16:27:52 +0000
parents e88c0aa4bb96
children d4fe6e23283e
comparison
equal deleted inserted replaced
25494:e88c0aa4bb96 25495:5cbf0cbeef7c
324 } 324 }
325 return data; 325 return data;
326 } 326 }
327 327
328 // check if clang has substring from comma separated langlist 328 // check if clang has substring from comma separated langlist
329 static int demux_ogg_check_lang(const char *clang, char *langlist) 329 static int demux_ogg_check_lang(const char *clang, const char *langlist)
330 { 330 {
331 char *c; 331 const char *c;
332 332
333 if (!langlist || !*langlist) 333 if (!langlist || !*langlist)
334 return 0; 334 return 0;
335 while ((c = strchr(langlist, ','))) 335 while ((c = strchr(langlist, ',')))
336 { 336 {
350 { 350 {
351 const char *hdr, *val; 351 const char *hdr, *val;
352 char **cmt = vc->user_comments; 352 char **cmt = vc->user_comments;
353 int index, i; 353 int index, i;
354 ogg_demuxer_t *ogg_d = d->priv; 354 ogg_demuxer_t *ogg_d = d->priv;
355 struct table { 355 static const struct table {
356 const char *ogg; 356 const char *ogg;
357 const char *mp; 357 const char *mp;
358 } table[] = { 358 } table[] = {
359 { "ENCODED_USING", "Software" }, 359 { "ENCODED_USING", "Software" },
360 { "ENCODER_URL", "Encoder URL" }, 360 { "ENCODER_URL", "Encoder URL" },
647 647
648 /** \brief Lookup the subtitle language by the subtitle number. Returns NULL on out-of-bounds input. 648 /** \brief Lookup the subtitle language by the subtitle number. Returns NULL on out-of-bounds input.
649 * \param demuxer The demuxer about whose subtitles we are inquiring. 649 * \param demuxer The demuxer about whose subtitles we are inquiring.
650 * \param index The subtitle number. 650 * \param index The subtitle number.
651 */ 651 */
652 char *demux_ogg_sub_lang(demuxer_t *demuxer, int index) { 652 const char *demux_ogg_sub_lang(demuxer_t *demuxer, int index) {
653 ogg_demuxer_t *ogg_d = demuxer->priv; 653 ogg_demuxer_t *ogg_d = demuxer->priv;
654 return (index < 0) ? NULL : (index >= ogg_d->n_text) ? NULL : ogg_d->text_langs[index]; 654 return (index < 0) ? NULL : (index >= ogg_d->n_text) ? NULL : ogg_d->text_langs[index];
655 } 655 }
656 656
657 static void demux_close_ogg(demuxer_t* demuxer); 657 static void demux_close_ogg(demuxer_t* demuxer);