Mercurial > mplayer.hg
comparison libmpdemux/demux_ogg.c @ 8618:a879b231b7e3
This patch adds a call to subcp_recode1(), so this subtitles too are
processed through iconv().
Kresimir Kukulj madmax@iskon.hr
author | arpi |
---|---|
date | Sat, 28 Dec 2002 15:19:41 +0000 |
parents | 22cbd7bcc6bf |
children | f8e53f8cb8b2 |
comparison
equal
deleted
inserted
replaced
8617:6ffbe7608013 | 8618:a879b231b7e3 |
---|---|
229 } | 229 } |
230 } | 230 } |
231 | 231 |
232 mp_msg(MSGT_DEMUX,MSGL_DBG2,"ogg sub lines: %d first: '%s'\n", | 232 mp_msg(MSGT_DEMUX,MSGL_DBG2,"ogg sub lines: %d first: '%s'\n", |
233 ogg_sub.lines, ogg_sub.text[0]); | 233 ogg_sub.lines, ogg_sub.text[0]); |
234 #ifdef USE_ICONV | |
235 subcp_recode1(&ogg_sub); | |
236 #endif | |
234 vo_sub = &ogg_sub; | 237 vo_sub = &ogg_sub; |
235 vo_osd_changed(OSDTYPE_SUBTITLE); | 238 vo_osd_changed(OSDTYPE_SUBTITLE); |
236 } | 239 } |
237 | 240 |
238 | 241 |
462 ogg_sync_state* sync; | 465 ogg_sync_state* sync; |
463 ogg_page* page; | 466 ogg_page* page; |
464 ogg_packet pack; | 467 ogg_packet pack; |
465 sh_audio_t* sh_a; | 468 sh_audio_t* sh_a; |
466 sh_video_t* sh_v; | 469 sh_video_t* sh_v; |
470 | |
471 #ifdef USE_ICONV | |
472 subcp_open(); | |
473 #endif | |
467 | 474 |
468 s = demuxer->stream; | 475 s = demuxer->stream; |
469 | 476 |
470 ogg_d = (ogg_demuxer_t*)calloc(1,sizeof(ogg_demuxer_t)); | 477 ogg_d = (ogg_demuxer_t*)calloc(1,sizeof(ogg_demuxer_t)); |
471 sync = &ogg_d->sync; | 478 sync = &ogg_d->sync; |
1004 ogg_demuxer_t* ogg_d = demuxer->priv; | 1011 ogg_demuxer_t* ogg_d = demuxer->priv; |
1005 | 1012 |
1006 if(!ogg_d) | 1013 if(!ogg_d) |
1007 return; | 1014 return; |
1008 | 1015 |
1016 #ifdef USE_ICONV | |
1017 subcp_close(); | |
1018 #endif | |
1019 | |
1009 if(ogg_d->subs) | 1020 if(ogg_d->subs) |
1010 free(ogg_d->subs); | 1021 free(ogg_d->subs); |
1011 if(ogg_d->syncpoints) | 1022 if(ogg_d->syncpoints) |
1012 free(ogg_d->syncpoints); | 1023 free(ogg_d->syncpoints); |
1013 free(ogg_d); | 1024 free(ogg_d); |