diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-11 17:48:45 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-11 17:55:05 +0200 |
| commit | a1692437d0a2cc88a2b3440bbcfb5e6f66cfd90e (patch) | |
| tree | f3ce630d220edecfa5c476658a3bda2a65695ee8 /mpcommon.c | |
| parent | f95674fb6cbd459e6b484caf94b490b7efede9d5 (diff) | |
| download | mpv-a1692437d0a2cc88a2b3440bbcfb5e6f66cfd90e.tar.bz2 mpv-a1692437d0a2cc88a2b3440bbcfb5e6f66cfd90e.tar.xz | |
core: move global "subdata" and "vo_sub_last" to mpctx
Diffstat (limited to 'mpcommon.c')
| -rw-r--r-- | mpcommon.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mpcommon.c b/mpcommon.c index a7e89d9ee1..2af26314bb 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -39,15 +39,13 @@ #include "libmpcodecs/dec_teletext.h" #include "ffmpeg_files/intreadwrite.h" #include "m_option.h" +#include "mp_core.h" #ifdef CONFIG_ASS #include "ass_mp.h" ASS_Track *ass_track = 0; // current track to render #endif -sub_data* subdata = NULL; -subtitle* vo_sub_last = NULL; - const char *mencoder_version = "MEncoder " VERSION; const char *mplayer_version = "MPlayer " VERSION; @@ -123,12 +121,13 @@ void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts, return; } // find sub - if (subdata) { + if (mpctx->subdata) { if (sub_fps==0) sub_fps = sh_video ? sh_video->fps : 25; current_module = "find_sub"; - find_sub(mpctx, subdata, curpts * - (subdata->sub_uses_time ? 100. : sub_fps)); - if (vo_sub) vo_sub_last = vo_sub; + find_sub(mpctx, mpctx->subdata, curpts * + (mpctx->subdata->sub_uses_time ? 100. : sub_fps)); + if (vo_sub) + mpctx->vo_sub_last = vo_sub; } // DVD sub: |