[vlc-commits] vout: ignore CHANGE_DISPLAY_SIZE failure

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Oct 15 22:14:52 2014 +0300| [d9bef016dcb6c99eca0d0c3e6e052c573d3a294a] | committer: Rémi Denis-Courmont

vout: ignore CHANGE_DISPLAY_SIZE failure

In practice, video output display plugins return an error when they do
not support arbitrary sizes. However nowadays, this control is requested
only when the video output or the video window report a change of size.
That cannot be allowed to fail: the display size is what it is
regardless of the result of the control request.

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

 src/video_output/display.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/video_output/display.c b/src/video_output/display.c
index 37a2204..f34b781 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -888,14 +888,8 @@ bool vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures)
             osys->width_saved  = osys->cfg.display.width;
             osys->height_saved = osys->cfg.display.height;
 
-            if (vout_display_Control(vd, VOUT_DISPLAY_CHANGE_DISPLAY_SIZE,
-                                     &cfg)) {
-                msg_Err(vd, "Failed to resize display");
+            vout_display_Control(vd, VOUT_DISPLAY_CHANGE_DISPLAY_SIZE, &cfg);
 
-                /* We ignore the resized */
-                display_width  = osys->cfg.display.width;
-                display_height = osys->cfg.display.height;
-            }
             osys->cfg.display.width  = display_width;
             osys->cfg.display.height = display_height;
         }