Mercurial > mplayer.hg

changeset 29686:add9ce0b0e55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable loading of external subtitles also for audio-only files.
author reimar
date Mon, 28 Sep 2009 11:26:19 +0000
parents f0b559a7c17b
children ce2631b54dec
files mplayer.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);