summaryrefslogtreecommitdiffstats
path: root/subreader.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-25 12:59:24 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-25 12:59:24 +0000
commit2bb2db0a655189b16556333dc4048bb2882e83af (patch)
tree1196138891376756ff0eb55f1f4436e9999dd774 /subreader.c
parenta8b78d514924326cfff1cca164300a20144592c3 (diff)
downloadmpv-2bb2db0a655189b16556333dc4048bb2882e83af.tar.bz2
mpv-2bb2db0a655189b16556333dc4048bb2882e83af.tar.xz
frame-based mpsub parser fix - patch by Rizsanyi Zsolt <rizsanyi@myrealbox.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5829 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'subreader.c')
-rw-r--r--subreader.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/subreader.c b/subreader.c
index 082218a20f..ee78fa8fc8 100644
--- a/subreader.c
+++ b/subreader.c
@@ -404,9 +404,9 @@ subtitle *sub_read_line_mpsub(FILE *fd, subtitle *current) {
if (!fgets(line, LINE_LEN, fd)) return NULL;
} while (sscanf (line, "%f %f", &a, &b) !=2);
- mpsub_position += (a*100.0);
+ mpsub_position += a*(sub_uses_time ? 100.0 : 1.0);
current->start=(int) mpsub_position;
- mpsub_position += (b*100.0);
+ mpsub_position += b*(sub_uses_time ? 100.0 : 1.0);
current->end=(int) mpsub_position;
while (num < SUB_MAX_TEXT) {