Commit 60491334 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

vout: reorder code

No functional changes
parent dfefe47f
......@@ -965,16 +965,6 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
vout_display_Prepare(vd, todisplay, subpic);
} else {
sys->display.filtered = vout_FilterDisplay(vd, todisplay);
if (sys->display.filtered) {
if (!do_dr_spu && !do_early_spu && vout->p->spu_blend && subpic)
picture_BlendSubpicture(sys->display.filtered, vout->p->spu_blend, subpic);
vout_display_Prepare(vd, sys->display.filtered, do_dr_spu ? subpic : NULL);
}
if (!do_dr_spu && subpic)
{
subpicture_Delete(subpic);
subpic = NULL;
}
if (!sys->display.filtered)
{
if (subpic != NULL)
......@@ -982,6 +972,16 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
return VLC_EGENERIC;
}
if (!do_dr_spu && !do_early_spu && vout->p->spu_blend && subpic)
picture_BlendSubpicture(sys->display.filtered, vout->p->spu_blend, subpic);
vout_display_Prepare(vd, sys->display.filtered, do_dr_spu ? subpic : NULL);
if (!do_dr_spu && subpic)
{
subpicture_Delete(subpic);
subpic = NULL;
}
todisplay = sys->display.filtered;
}
......
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