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

Clément Bœsch ubitux at gmail.com
Wed Jan 12 22:13:04 CET 2011


---
 mplayer.c |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/mplayer.c b/mplayer.c
index 4676c47..a5b9ad9 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3528,24 +3528,19 @@ 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);
+  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;
 
 //================== MAIN: ==========================
-main:
 current_module="main";
 
     if(playing_msg) {
-- 
1.7.3.5


--BwCQnh7xodEAoBMC--


More information about the MPlayer-dev-eng mailing list