[vlc-commits] display: ignore zoom change failure

Rémi Denis-Courmont git at videolan.org
Sat Sep 2 19:22:39 CEST 2017


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Aug 10 18:16:42 2017 +0300| [3990258f31c541d7bbbeef2c41379e9bd1e152b4] | committer: Rémi Denis-Courmont

display: ignore zoom change failure

There are no reasons why zoom change should fail or be allowed to fail
while size change cannot.

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

 src/video_output/display.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/video_output/display.c b/src/video_output/display.c
index 778942be4e..08231fa732 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -869,14 +869,9 @@ bool vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures)
                 cfg.zoom.den = 1;
             }
 
-            if (vout_display_Control(vd, VOUT_DISPLAY_CHANGE_ZOOM, &cfg)) {
-                msg_Err(vd, "Failed to change zoom");
-                osys->zoom.num = osys->cfg.zoom.num;
-                osys->zoom.den = osys->cfg.zoom.den;
-            } else {
-                osys->fit_window = -1;
-            }
+            vout_display_Control(vd, VOUT_DISPLAY_CHANGE_ZOOM, &cfg);
 
+            osys->fit_window = -1;
             osys->cfg.zoom.num = osys->zoom.num;
             osys->cfg.zoom.den = osys->zoom.den;
             osys->ch_zoom = false;



More information about the vlc-commits mailing list