summaryrefslogtreecommitdiffstats
path: root/subreader.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-22 13:24:58 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-22 13:24:58 +0000
commitf2b9c324ff79f878e5648b5290f54695721891f6 (patch)
treee8b5e70796e82298055a8b44bbdec47531f4d00a /subreader.c
parent719cb34fb624c494ca99bf9b8709c9555310efee (diff)
downloadmpv-f2b9c324ff79f878e5648b5290f54695721891f6.tar.bz2
mpv-f2b9c324ff79f878e5648b5290f54695721891f6.tar.xz
Revert r24103, it was nonsense and add a comment that explains the code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24591 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'subreader.c')
-rw-r--r--subreader.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/subreader.c b/subreader.c
index a83ce4ee1e..1a58b3231d 100644
--- a/subreader.c
+++ b/subreader.c
@@ -1255,7 +1255,9 @@ static void adjust_subs_time(subtitle* sub, float subtime, float fps, int block,
*/
/* timed sub fps correction ::atmos */
- if(sub_fps) {
+ /* the frame-based case is handled in mpcommon.c
+ * where find_sub is called */
+ if(sub_uses_time && sub_fps) {
sub->start *= sub_fps/fps;
sub->end *= sub_fps/fps;
}