[vlc-commits] vout_wrapper: always allow resetting pictures

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Dec  9 11:12:39 2018 +0200| [2b792318fa04fd83b180c7703c383eb1d887a28b] | committer: Rémi Denis-Courmont

vout_wrapper: always allow resetting pictures

Always pass true for the second parameter of vout_ManageDisplay().

If vout_AreDisplayPicturesInvalid(vd) was true, this does not change
the value of the parameter.

If vout_AreDisplayPicturesInvalid(vd) was false, then setting the
allow_reset_pictures parameter had no effects within
vout_ManageDisplay() because atomic_exchange() below would evaluate
to false regardless of allow_reset_pictures:

    if (allow_reset_pictures
     && atomic_exchange(&osys->reset_pictures, false))

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2b792318fa04fd83b180c7703c383eb1d887a28b
---

 src/video_output/vout_wrapper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index 3f90285bc5..5625a920f6 100644
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -185,7 +185,7 @@ void vout_ManageWrapper(vout_thread_t *vout)
     vout_display_t *vd = sys->display.vd;
 
     bool reset_display_pool = vout_AreDisplayPicturesInvalid(vd);
-    reset_display_pool |= vout_ManageDisplay(vd, !sys->display.use_dr || reset_display_pool);
+    reset_display_pool |= vout_ManageDisplay(vd, true);
 
     if (reset_display_pool) {
         sys->display.use_dr = !vout_IsDisplayFiltered(vd);