vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Wed Oct 21 21:20:23 2015 +0300| [604913343e6c7106f15f0fe3b8261ffb642e89bf] | committer: Rémi Denis-Courmont
vout: reorder code No functional changes > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=604913343e6c7106f15f0fe3b8261ffb642e89bf --- src/video_output/video_output.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index ae9edfe..095e7f3 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -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; } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
