diff options
author | laaz <laaz@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-28 02:37:13 +0000 |
---|---|---|
committer | laaz <laaz@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-28 02:37:13 +0000 |
commit | e0acf7f92c95e1c36de53a5da31391c427f40a8b (patch) | |
tree | 50ce0084a6c45e181b477063e4b0a0573fd76e5c /subreader.c | |
parent | 6f4effaf5bd54244b7966e2482ab807674550bdb (diff) | |
download | mpv-e0acf7f92c95e1c36de53a5da31391c427f40a8b.tar.bz2 mpv-e0acf7f92c95e1c36de53a5da31391c427f40a8b.tar.xz |
-subfps and -subdelay alters -dumpmpsub's output
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4887 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'subreader.c')
-rw-r--r-- | subreader.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/subreader.c b/subreader.c index d302874fa7..cb1cf4585b 100644 --- a/subreader.c +++ b/subreader.c @@ -517,6 +517,9 @@ int sub_utf8=0; extern int sub_utf8; #endif +extern float sub_delay; +extern float sub_fps; + #ifdef USE_ICONV static iconv_t icdsc; @@ -788,7 +791,8 @@ void dump_mpsub(subtitle* subs, float fps){ FILE *fd; float a,b; - mpsub_position=0.0; + mpsub_position=sub_uses_time?(sub_delay*100):(sub_delay*fps); + if (sub_fps==0) sub_fps=fps; fd=fopen ("dump.mpsub", "w"); if (!fd) { @@ -815,8 +819,8 @@ void dump_mpsub(subtitle* subs, float fps){ else fprintf (fd, " %.2f\n",b); } else { - fprintf (fd, "%ld %ld\n", (egysub->start)-((long)mpsub_position), - (egysub->end)-(egysub->start)); + fprintf (fd, "%ld %ld\n", (long)((egysub->start*(fps/sub_fps))-((mpsub_position*(fps/sub_fps)))), + (long)(((egysub->end)-(egysub->start))*(fps/sub_fps))); } mpsub_position = egysub->end; @@ -856,7 +860,7 @@ int main(int argc, char **argv) { // for testing sub_cp = argv[2]; subs=sub_read_file(argv[1]); if(!subs){ - printf("Couldn't load file... let's write a bugreport :)\n"); + printf("Couldn't load file.\n"); exit(1); } |