[PATCH] Get rid of the "main" label.

[Clément Bœsch]

---
 mplayer.c |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/mplayer.c b/mplayer.c
index c0e540e..6882364 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3537,24 +3537,11 @@ if (select_subtitle(mpctx)) {
       }
   }
 
-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);
-
-#ifdef CONFIG_FREETYPE
-   force_load_font = 1;
-#endif
+if (mpctx->sh_video && !reinit_video_chain() &&
+    !mpctx->sh_video && !mpctx->sh_audio)
+    goto goto_next_file;
 
 //================== MAIN: ==========================
-main:
 current_module="main";
 
     if(playing_msg) {
@@ -3589,6 +3576,14 @@ if(mpctx->sh_audio){
 current_module="av_init";
 
 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;
+#endif
+
   mpctx->sh_video->timer=0;
   if (! ignore_start)
     audio_delay += mpctx->sh_video->stream_delay;
-- 
1.7.3.4


--/NkBOFFp2J2Af1nK--