summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-03-15 22:17:51 +0100
committerwm4 <wm4@nowhere>2014-03-15 22:17:51 +0100
commit86689f7bf23dd05b5e6b9e42e43379d52e27c338 (patch)
tree05040ae3532ec9718e320b69a11d97264935f83b /player
parentf6b4f60264000ab16459639063cdfae64c3db942 (diff)
downloadmpv-86689f7bf23dd05b5e6b9e42e43379d52e27c338.tar.bz2
mpv-86689f7bf23dd05b5e6b9e42e43379d52e27c338.tar.xz
demux_libass: change how external ASS subtitles are loaded
Instead of parsing the ASS file in demux_libass.c and trying to pass the ASS_Track to the subtitle renderer, just read all file data in demux_libass.c, and let the subtitle renderer pass the file contents to ass_process_codec_private(). (This happens to parse full files too.) Makes the code simpler, though it also relies harder on the (messy) probe logic in demux_libass.c.
Diffstat (limited to 'player')
-rw-r--r--player/loadfile.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 05f4646d0a..bdea43b352 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -439,9 +439,6 @@ static struct track *add_stream_track(struct MPContext *mpctx,
};
MP_TARRAY_APPEND(mpctx, mpctx->tracks, mpctx->num_tracks, track);
- if (stream->type == STREAM_SUB)
- track->preloaded = !!stream->sub->track;
-
// Needed for DVD and Blu-ray.
struct stream *st = track->demuxer->stream;
if (!track->lang && (st->uncached_type == STREAMTYPE_BLURAY ||
@@ -789,7 +786,6 @@ static struct track *open_external_file(struct MPContext *mpctx, char *filename,
opts->stream_cache_min_percent,
opts->stream_cache_seek_min_percent);
struct demuxer_params params = {
- .ass_library = mpctx->ass_library, // demux_libass requires it
.expect_subtitle = filter == STREAM_SUB,
};
struct demuxer *demuxer =