[vlc-commits] vout: pass cfg to VOUT_DISPLAY_CHANGE_SOURCE_* controls

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Sun Oct 28 15:50:23 2018 +0100| [ae4e22201fe3c85f1f29ef53de2d7bbd02e15186] | committer: Steve Lhomme

vout: pass cfg to VOUT_DISPLAY_CHANGE_SOURCE_* controls

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

 include/vlc_vout_display.h | 4 ++--
 src/video_output/display.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index a46e2faac0..95483f6d79 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -146,13 +146,13 @@ enum {
 
     /* Ask the module to acknowledge/refuse source aspect ratio after being
      * requested externally */
-    VOUT_DISPLAY_CHANGE_SOURCE_ASPECT,
+    VOUT_DISPLAY_CHANGE_SOURCE_ASPECT, /* const vout_display_cfg_t *p_cfg */
 
     /* Ask the module to acknowledge/refuse source crop change after being
      * requested externally.
      * The cropping requested is stored by source video_format_t::i_x/y_offset
      * and video_format_t::i_visible_width/height */
-    VOUT_DISPLAY_CHANGE_SOURCE_CROP,
+    VOUT_DISPLAY_CHANGE_SOURCE_CROP, /* const vout_display_cfg_t *p_cfg */
 
     /* Ask the module to acknowledge/refuse VR/360° viewing direction after
      * being requested externally */
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 21b0b3ed87..d6220c2fef 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -675,7 +675,7 @@ bool vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures)
             vd->source.i_sar_den = osys->source.i_sar_den;
         }
 
-        vout_display_Control(vd, VOUT_DISPLAY_CHANGE_SOURCE_ASPECT);
+        vout_display_Control(vd, VOUT_DISPLAY_CHANGE_SOURCE_ASPECT, &osys->cfg);
         osys->sar.num = vd->source.i_sar_num;
         osys->sar.den = vd->source.i_sar_den;
         osys->ch_sar  = false;
@@ -723,7 +723,7 @@ bool vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures)
         vd->source.i_visible_height = bottom - top;
         video_format_Print(VLC_OBJECT(vd), "SOURCE ", &osys->source);
         video_format_Print(VLC_OBJECT(vd), "CROPPED", &vd->source);
-        vout_display_Control(vd, VOUT_DISPLAY_CHANGE_SOURCE_CROP);
+        vout_display_Control(vd, VOUT_DISPLAY_CHANGE_SOURCE_CROP, &osys->cfg);
         osys->crop.left   = left - osys->source.i_x_offset;
         osys->crop.top    = top  - osys->source.i_y_offset;
         /* FIXME for right/bottom we should keep the 'type' border vs window */