[MPlayer-cvslog] r32791 - trunk/mplayer.c

[cboesch]

Author: cboesch
Date: Sun Jan 16 13:11:14 2011
New Revision: 32791

Log:
Get rid of the "main" label.

Note this also fix a potential crash related to the reinit_video_chain call.

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Sat Jan 15 21:40:18 2011	(r32790)
+++ trunk/mplayer.c	Sun Jan 16 13:11:14 2011	(r32791)
@@ -3528,24 +3528,20 @@ 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 (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;
 #endif
+  } else if (!mpctx->sh_audio)
+      goto goto_next_file;
 
 //================== MAIN: ==========================
-main:
 current_module="main";
 
     if(playing_msg) {