diff options
| author | cboesch <cboesch@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2011-01-16 12:11:14 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-31 16:03:10 +0200 |
| commit | 5cb40ec42ff36d0e639937546eac74af19740a5b (patch) | |
| tree | 0fdf1b3492aa277c16f4eeb74eee6b9493d67a9d /mplayer.c | |
| parent | 303865cb8197d0b86866ecb15f4c516cd8264008 (diff) | |
| download | mpv-5cb40ec42ff36d0e639937546eac74af19740a5b.tar.bz2 mpv-5cb40ec42ff36d0e639937546eac74af19740a5b.tar.xz | |
mplayer.c: simplify code a bit, remove "main:" label
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32791 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 20 |
1 files changed, 7 insertions, 13 deletions
@@ -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) { |