Mercurial > mplayer.hg
diff mplayer.c @ 18934:a3788ff5d0b6
Rename mkv_sh_sub_t to sh_sub_t, move it to demuxer.h.
| author | eugeni |
|---|---|
| date | Fri, 07 Jul 2006 18:02:49 +0000 |
| parents | 13fd66346cd5 |
| children | 9e95ac641e77 |
line wrap: on
line diff
--- a/mplayer.c Fri Jul 07 17:04:04 2006 +0000 +++ b/mplayer.c Fri Jul 07 18:02:49 2006 +0000 @@ -1947,8 +1947,8 @@ if (demuxer->type == DEMUXER_TYPE_MATROSKA) { d_dvdsub->id = demux_mkv_change_subs(demuxer, dvdsub_id); if (d_dvdsub->id >= 0 && - ((mkv_sh_sub_t *)d_dvdsub->sh)->type == 'v') { - mkv_sh_sub_t *mkv_sh_sub = (mkv_sh_sub_t *)d_dvdsub->sh; + ((sh_sub_t *)d_dvdsub->sh)->type == 'v') { + sh_sub_t *mkv_sh_sub = (sh_sub_t *)d_dvdsub->sh; if (vo_spudec != NULL) spudec_free(vo_spudec); vo_spudec = @@ -3405,8 +3405,8 @@ #endif if ((vo_spudec == NULL) && (demuxer->type == DEMUXER_TYPE_MATROSKA) && - (d_dvdsub->sh != NULL) && (((mkv_sh_sub_t *)d_dvdsub->sh)->type == 'v')) { - mkv_sh_sub_t *mkv_sh_sub = (mkv_sh_sub_t *)d_dvdsub->sh; + (d_dvdsub->sh != NULL) && (((sh_sub_t *)d_dvdsub->sh)->type == 'v')) { + sh_sub_t *mkv_sh_sub = (sh_sub_t *)d_dvdsub->sh; current_module = "spudec_init_matroska"; vo_spudec = spudec_new_scaled_vobsub(mkv_sh_sub->palette, mkv_sh_sub->colors,