Skip to content
Snippets Groups Projects
Commit 81385c97 authored by Steve Lhomme's avatar Steve Lhomme Committed by Jean-Baptiste Kempf
Browse files

vout: remove spu_blend_chroma

It's only written for checking if it changed. But if it changed
the spu_blend
must have been deleted anyway. So we only need to test spu_blend.
parent 081a0e62
No related branches found
No related tags found
1 merge request!4077vout: remove spu_blend_chroma
Pipeline #374258 passed with stage
in 20 minutes and 47 seconds
......@@ -102,7 +102,6 @@ typedef struct vout_thread_sys_t
/* Subpicture unit */
spu_t *spu;
vlc_fourcc_t spu_blend_chroma;
vlc_blender_t *spu_blend;
/* Thread & synchronization */
......@@ -1170,10 +1169,8 @@ static int PrerenderPicture(vout_thread_sys_t *sys, picture_t *filtered,
sys->spu_blend->fmt_out.video.i_chroma != fmt_spu.i_chroma) {
filter_DeleteBlend(sys->spu_blend);
sys->spu_blend = NULL;
sys->spu_blend_chroma = 0;
}
if (!sys->spu_blend && sys->spu_blend_chroma != fmt_spu.i_chroma) {
sys->spu_blend_chroma = fmt_spu.i_chroma;
if (!sys->spu_blend) {
sys->spu_blend = filter_NewBlend(VLC_OBJECT(&sys->obj), &fmt_spu);
if (!sys->spu_blend)
msg_Err(&sys->obj, "Failed to create blending filter, OSD/Subtitles will not work");
......@@ -1746,7 +1743,6 @@ static int vout_Start(vout_thread_sys_t *vout, vlc_video_context *vctx, const vo
sys->pause.is_on = false;
sys->pause.date = VLC_TICK_INVALID;
sys->spu_blend_chroma = 0;
sys->spu_blend = NULL;
video_format_Print(VLC_OBJECT(&vout->obj), "original format", &sys->original);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment