From 5cb40ec42ff36d0e639937546eac74af19740a5b Mon Sep 17 00:00:00 2001 From: cboesch Date: Sun, 16 Jan 2011 12:11:14 +0000 Subject: mplayer.c: simplify code a bit, remove "main:" label git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32791 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index e5eea0890c..cc6d79b051 100644 --- a/mplayer.c +++ b/mplayer.c @@ -4721,24 +4721,18 @@ if (select_subtitle(mpctx)) { print_file_properties(mpctx, mpctx->filename); -if(!mpctx->sh_video) goto main; // audio-only - -if(!reinit_video_chain(mpctx)) { - if(!mpctx->sh_video){ - if(!mpctx->sh_audio) goto goto_next_file; - goto main; // exit_player(_("Fatal error")); - } -} - - if(mpctx->sh_video->output_flags & VFCAP_SPU && vo_spudec) + if (mpctx->sh_video) + reinit_video_chain(mpctx); + if (mpctx->sh_video) { + if(mpctx->sh_video->output_flags & VFCAP_SPU && 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; //================== MAIN: ========================== -main: current_module="main"; if (opts->playing_msg) { -- cgit v1.2.3