summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-07 14:21:12 +0100
committerwm4 <wm4@nowhere>2014-12-07 14:21:12 +0100
commit3afe76133b184260db726269d6495b5bbf044b4d (patch)
tree003db561067ec8ce770822844ee66cd79413854b
parent090f6cfc30a55c044b45dbd66cd46d8a66ce4b44 (diff)
downloadmpv-3afe76133b184260db726269d6495b5bbf044b4d.tar.bz2
mpv-3afe76133b184260db726269d6495b5bbf044b4d.tar.xz
sub: remove assertion
This should clearly be impossible, but it seems to happen with ordered chapters for a user. Since I can't tell what the actual bug is and it seems impossible to know the details without downloading possibly huge files, this is probably the best we can do. Should at least partially fix #1319.
-rw-r--r--player/sub.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/player/sub.c b/player/sub.c
index 461f7023cf..0323d49772 100644
--- a/player/sub.c
+++ b/player/sub.c
@@ -227,10 +227,9 @@ static void update_subtitle(struct MPContext *mpctx, int order)
struct track *track = mpctx->current_track[order][STREAM_SUB];
struct dec_sub *dec_sub = mpctx->d_sub[order];
- if (!track)
+ if (!track || !dec_sub)
return;
- assert(dec_sub);
int obj = order ? OSDTYPE_SUB2 : OSDTYPE_SUB;
if (mpctx->d_video) {