Mercurial > mplayer.hg

changeset 32704:fd7560f8d530

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of the "main" label. Note this also fix a potential crash related to the reinit_video_chain call.
author cboesch
date Sun, 16 Jan 2011 12:11:14 +0000
parents 84a45d5c1102
children d39425c8fe53
files mplayer.c
diffstat 1 files changed, 6 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Sat Jan 15 20:40:18 2011 +0000
+++ b/mplayer.c	Sun Jan 16 12:11:14 2011 +0000
@@ -3528,24 +3528,20 @@
       }
   }
 
-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) {