# HG changeset patch # User reimar # Date 1254137179 0 # Node ID add9ce0b0e5539c4a2b54ec5c4502ed13acd595d # Parent f0b559a7c17badc4ee38fa70d4e92397053b2bed Enable loading of external subtitles also for audio-only files. diff -r f0b559a7c17b -r add9ce0b0e55 mplayer.c --- a/mplayer.c Mon Sep 28 11:24:13 2009 +0000 +++ b/mplayer.c Mon Sep 28 11:26:19 2009 +0000 @@ -3450,14 +3450,15 @@ init_vo_spudec(); } -if(mpctx->sh_video) { +if(1 || mpctx->sh_video) { // after reading video params we should load subtitles because // we know fps so now we can adjust subtitle time to ~6 seconds AST // check .sub + double fps = mpctx->sh_video ? mpctx->sh_video->fps : 25; current_module="read_subtitles_file"; if(sub_name){ for (i = 0; sub_name[i] != NULL; ++i) - add_subtitles (sub_name[i], mpctx->sh_video->fps, 0); + add_subtitles (sub_name[i], fps, 0); } if(sub_auto) { // auto load sub file ... char *psub = get_path( "sub/" ); @@ -3465,7 +3466,7 @@ int i = 0; free(psub); // release the buffer created by get_path() above while (tmp[i]) { - add_subtitles (tmp[i], mpctx->sh_video->fps, 1); + add_subtitles (tmp[i], fps, 1); free(tmp[i++]); } free(tmp);