[MPlayer-dev-eng] [PATCH] cosmetics on sub_select code
Joey Parrish
joey at nicewarrior.org
Tue Sep 28 16:10:54 CEST 2004
Hello,
This is a patch to reindent a big piece of the subtitle code.
Any objections? Otherwise, I'll commit tomorrow or soon after.
--Joey
--
"SAKE!!!!" --Tom Cruise
-------------- next part --------------
--- main.sofar/mplayer.c 2004-09-24 00:41:59.723872000 -0500
+++ main.dev/mplayer.c 2004-09-24 00:41:54.055721600 -0500
@@ -3271,23 +3271,23 @@
#ifdef HAVE_MATROSKA
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;
- if (vo_spudec != NULL)
- spudec_free(vo_spudec);
- vo_spudec =
- spudec_new_scaled_vobsub(mkv_sh_sub->palette, mkv_sh_sub->colors,
- mkv_sh_sub->custom_colors,
- mkv_sh_sub->width,
- mkv_sh_sub->height);
- if (!forced_subs_only)
- forced_subs_only = mkv_sh_sub->forced_subs_only;
- if (vo_spudec) {
- spudec_set_forced_subs_only(vo_spudec, forced_subs_only);
- inited_flags |= INITED_SPUDEC;
- }
- }
- }
+ 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;
+ if (vo_spudec != NULL)
+ spudec_free(vo_spudec);
+ vo_spudec =
+ spudec_new_scaled_vobsub(mkv_sh_sub->palette, mkv_sh_sub->colors,
+ mkv_sh_sub->custom_colors,
+ mkv_sh_sub->width,
+ mkv_sh_sub->height);
+ if (!forced_subs_only)
+ forced_subs_only = mkv_sh_sub->forced_subs_only;
+ if (vo_spudec) {
+ spudec_set_forced_subs_only(vo_spudec, forced_subs_only);
+ inited_flags |= INITED_SPUDEC;
+ }
+ }
+ }
#endif
}
if (!global_sub_quiet_osd_hack) osd_show_vobsub_changed = sh_video->fps;
More information about the MPlayer-dev-eng
mailing list