Commit 0ba7c06e authored by Thomas Guillem's avatar Thomas Guillem Committed by Jean-Baptiste Kempf

android/opaque: fix crash on Close with subtitles

The pixels allocated from picture_NewFromFormat were replaced (and leaked) by
pixels allocated by android native windows. This also leaded to a crash on
Close when subtitles_picture was freed.

Use picture_NewFromResource with an empty to resource in order to don't
allocate any pixels.
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 4e943d01
......@@ -195,7 +195,9 @@ static int Open(vlc_object_t *p_this)
video_format_t subpicture_format = sys->fmt;
subpicture_format.i_chroma = VLC_CODEC_RGBA;
/* Create a RGBA picture for rendering subtitles. */
sys->subtitles_picture = picture_NewFromFormat(&subpicture_format);
picture_resource_t rsc;
memset(&rsc, 0, sizeof(rsc));
sys->subtitles_picture = picture_NewFromResource(&subpicture_format, &rsc);
/* Export the subpicture capability of this vout. */
vd->info.subpicture_chromas = subpicture_chromas;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment