[vlc-commits] video output: use locally cleaned video format to get the display configuration

Steve Lhomme git at videolan.org
Mon Sep 2 15:54:39 CEST 2019


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Jul 11 14:17:53 2019 +0200| [885897480cb30baa4a562f3e09f0e08907e5e92c] | committer: Steve Lhomme

video output: use locally cleaned video format to get the display configuration

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

 src/video_output/video_output.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 7968a65f88..468ed533d4 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -629,10 +629,10 @@ void vout_ChangeViewpoint(vout_thread_t *vout,
 }
 
 /* */
-static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg)
+static void VoutGetDisplayCfg(vout_thread_t *vout, const video_format_t *fmt, vout_display_cfg_t *cfg)
 {
     /* Load configuration */
-    cfg->viewpoint = vout->p->original.pose;
+    cfg->viewpoint = fmt->pose;
 
     const int display_width = var_GetInteger(vout, "width");
     const int display_height = var_GetInteger(vout, "height");
@@ -1912,7 +1912,7 @@ int vout_Request(const vout_configuration_t *cfg, input_thread_t *input)
 #endif
         };
 
-        VoutGetDisplayCfg(vout, &sys->display_cfg);
+        VoutGetDisplayCfg(vout, &original, &sys->display_cfg);
         vout_SizeWindow(vout, &wcfg.width, &wcfg.height);
 
         if (vout_window_Enable(sys->display_cfg.window, &wcfg)) {



More information about the vlc-commits mailing list