1 files changed, 7 insertions, 13 deletions
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) {