On Thu, Jan 13, 2011 at 07:55:21AM +0100, Reimar Döffinger wrote:
[...] -if(!mpctx->sh_video) goto main; // audio-only - -if(!reinit_video_chain()) { - if(!mpctx->sh_video){ - if(!mpctx->sh_audio) goto goto_next_file; - goto main; // exit_player(MSGTR_Exit_error); - } -} - - if(vo_flags & 0x08 && vo_spudec) - spudec_set_hw_spu(vo_spudec,mpctx->video_out); + if (mpctx->sh_video) + reinit_video_chain();
+ if (mpctx->sh_video) { + if (vo_flags & 0x08 && vo_spudec) + spudec_set_hw_spu(vo_spudec, mpctx->video_out); #ifdef CONFIG_FREETYPE - force_load_font = 1; + force_load_font = 1; #endif + } else if (!mpctx->sh_audio) + goto goto_next_file;
While it's small enough to be readable/reviewable okish anyway, I'd prefer it if you applied reindenting the unchanged parts separately. Otherwise ok.
Applied without reindent, thank you. -- Clément B.