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 /mplayer.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 'mplayer.c')
-rw-r--r-- | mplayer.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -4415,14 +4415,14 @@ if(vo_spudec==NULL && mpctx->sub_counts[SUB_SOURCE_SUBS] = mpctx->set_of_sub_size; if (select_subtitle(mpctx)) { - if(subdata) + if(mpctx->subdata) switch (stream_dump_type) { - case 3: list_sub_file(subdata); break; - case 4: dump_mpsub(subdata, mpctx->sh_video->fps); break; - case 6: dump_srt(subdata, mpctx->sh_video->fps); break; - case 7: dump_microdvd(subdata, mpctx->sh_video->fps); break; - case 8: dump_jacosub(subdata, mpctx->sh_video->fps); break; - case 9: dump_sami(subdata, mpctx->sh_video->fps); break; + case 3: list_sub_file(mpctx->subdata); break; + case 4: dump_mpsub(mpctx->subdata, mpctx->sh_video->fps); break; + case 6: dump_srt(mpctx->subdata, mpctx->sh_video->fps); break; + case 7: dump_microdvd(mpctx->subdata, mpctx->sh_video->fps); break; + case 8: dump_jacosub(mpctx->subdata, mpctx->sh_video->fps); break; + case 9: dump_sami(mpctx->subdata, mpctx->sh_video->fps); break; } } @@ -4645,8 +4645,8 @@ if(mpctx->set_of_sub_size > 0) { } mpctx->set_of_sub_size = 0; } -vo_sub_last = vo_sub=NULL; -subdata=NULL; +mpctx->vo_sub_last = vo_sub=NULL; +mpctx->subdata=NULL; #ifdef CONFIG_ASS ass_track = NULL; if(ass_library) |