RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

ass_mp: reset packer when allocation fails 

Sometimes the atlas can get so large that it exceeds the maximum allowed
size for an mp_image. Since the atlas will never shrink naturally, this
breaks subtitles entirely until mpv is restarted. Reset the packer so
that subtitles can rendered properly once the atlas fits again.

This is a partial workaround for #6286.
This commit is contained in:
Dan Elkouby 2019-11-02 15:24:56 +02:00 committed by wm4
parent 985a1cde5a
commit dfc060f099
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sub/ass_mp.c
View File

@ -230,8 +230,10 @@ static bool pack(struct mp_ass_packer *p, struct sub_bitmaps *res, int imgfmt)
{ {
talloc_free(p->cached_img); talloc_free(p->cached_img);
p->cached_img = mp_image_alloc(imgfmt, p->packer->w, p->packer->h); p->cached_img = mp_image_alloc(imgfmt, p->packer->w, p->packer->h);
if (!p->cached_img) if (!p->cached_img) {
packer_reset(p->packer);
return false; return false;
}
talloc_steal(p, p->cached_img); talloc_steal(p, p->cached_img);
} }