Mercurial > mplayer.hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
18933:4d4ecbaa9f54 | 18934:a3788ff5d0b6 |
---|---|
1945 d_dvdsub->id = demux_ogg_sub_id(demuxer, dvdsub_id); | 1945 d_dvdsub->id = demux_ogg_sub_id(demuxer, dvdsub_id); |
1946 #endif | 1946 #endif |
1947 if (demuxer->type == DEMUXER_TYPE_MATROSKA) { | 1947 if (demuxer->type == DEMUXER_TYPE_MATROSKA) { |
1948 d_dvdsub->id = demux_mkv_change_subs(demuxer, dvdsub_id); | 1948 d_dvdsub->id = demux_mkv_change_subs(demuxer, dvdsub_id); |
1949 if (d_dvdsub->id >= 0 && | 1949 if (d_dvdsub->id >= 0 && |
1950 ((mkv_sh_sub_t *)d_dvdsub->sh)->type == 'v') { | 1950 ((sh_sub_t *)d_dvdsub->sh)->type == 'v') { |
1951 mkv_sh_sub_t *mkv_sh_sub = (mkv_sh_sub_t *)d_dvdsub->sh; | 1951 sh_sub_t *mkv_sh_sub = (sh_sub_t *)d_dvdsub->sh; |
1952 if (vo_spudec != NULL) | 1952 if (vo_spudec != NULL) |
1953 spudec_free(vo_spudec); | 1953 spudec_free(vo_spudec); |
1954 vo_spudec = | 1954 vo_spudec = |
1955 spudec_new_scaled_vobsub(mkv_sh_sub->has_palette ? | 1955 spudec_new_scaled_vobsub(mkv_sh_sub->has_palette ? |
1956 mkv_sh_sub->palette : | 1956 mkv_sh_sub->palette : |
3403 sh_video->disp_w, sh_video->disp_h); | 3403 sh_video->disp_w, sh_video->disp_h); |
3404 } | 3404 } |
3405 #endif | 3405 #endif |
3406 | 3406 |
3407 if ((vo_spudec == NULL) && (demuxer->type == DEMUXER_TYPE_MATROSKA) && | 3407 if ((vo_spudec == NULL) && (demuxer->type == DEMUXER_TYPE_MATROSKA) && |
3408 (d_dvdsub->sh != NULL) && (((mkv_sh_sub_t *)d_dvdsub->sh)->type == 'v')) { | 3408 (d_dvdsub->sh != NULL) && (((sh_sub_t *)d_dvdsub->sh)->type == 'v')) { |
3409 mkv_sh_sub_t *mkv_sh_sub = (mkv_sh_sub_t *)d_dvdsub->sh; | 3409 sh_sub_t *mkv_sh_sub = (sh_sub_t *)d_dvdsub->sh; |
3410 current_module = "spudec_init_matroska"; | 3410 current_module = "spudec_init_matroska"; |
3411 vo_spudec = | 3411 vo_spudec = |
3412 spudec_new_scaled_vobsub(mkv_sh_sub->palette, mkv_sh_sub->colors, | 3412 spudec_new_scaled_vobsub(mkv_sh_sub->palette, mkv_sh_sub->colors, |
3413 mkv_sh_sub->custom_colors, mkv_sh_sub->width, | 3413 mkv_sh_sub->custom_colors, mkv_sh_sub->width, |
3414 mkv_sh_sub->height); | 3414 mkv_sh_sub->height); |