diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-11 17:35:28 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-11 17:38:15 +0200 |
| commit | f95674fb6cbd459e6b484caf94b490b7efede9d5 (patch) | |
| tree | 383324954939b739d47ce8df4a85fa88f820f3ec /mpcommon.c | |
| parent | b26fbeddd85aae6cda93d01335bed5f108a3ff57 (diff) | |
| download | mpv-f95674fb6cbd459e6b484caf94b490b7efede9d5.tar.bz2 mpv-f95674fb6cbd459e6b484caf94b490b7efede9d5.tar.xz | |
subtitles: remove sub_last_pts hack
This code was probably added because of bad pts handling in old timing
code, and should not be needed any more.
Diffstat (limited to 'mpcommon.c')
| -rw-r--r-- | mpcommon.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/mpcommon.c b/mpcommon.c index a5e71b839e..a7e89d9ee1 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -40,8 +40,6 @@ #include "ffmpeg_files/intreadwrite.h" #include "m_option.h" -double sub_last_pts = -303; - #ifdef CONFIG_ASS #include "ass_mp.h" ASS_Track *ass_track = 0; // current track to render @@ -128,13 +126,9 @@ void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts, if (subdata) { if (sub_fps==0) sub_fps = sh_video ? sh_video->fps : 25; current_module = "find_sub"; - if (refpts > sub_last_pts || refpts < sub_last_pts-1.0) { - find_sub(mpctx, subdata, curpts * - (subdata->sub_uses_time ? 100. : sub_fps)); - if (vo_sub) vo_sub_last = vo_sub; - // FIXME! frame counter... - sub_last_pts = refpts; - } + find_sub(mpctx, subdata, curpts * + (subdata->sub_uses_time ? 100. : sub_fps)); + if (vo_sub) vo_sub_last = vo_sub; } // DVD sub: |