vlc | branch: master | Marvin Scholz <epira...@gmail.com> | Mon Aug  7 12:08:47 
2017 +0200| [fb37b650d06f5b6cf3ea5109efd3a23c75de3c9a] | committer: Marvin 
Scholz

vout/macosx: Do not use passed video_format_t for CROP/ASPECT_RATIO changes

Since d9e1ff011ef0ebd262219df8e9ba3948afb7825f this is no longer passed,
vd->source is used instead.

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

 modules/video_output/macosx.m | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 6e43307af8..cc24a2ed4e 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -376,13 +376,10 @@ static int Control (vout_display_t *vd, int query, 
va_list ap)
                 NSSize windowMinSize = [o_window minSize];
 
                 const vout_display_cfg_t *cfg;
-                const video_format_t *source;
 
                 if (query == VOUT_DISPLAY_CHANGE_SOURCE_ASPECT || query == 
VOUT_DISPLAY_CHANGE_SOURCE_CROP) {
-                    source = (const video_format_t *)va_arg (ap, const 
video_format_t *);
                     cfg = vd->cfg;
                 } else {
-                    source = &vd->source;
                     cfg = (const vout_display_cfg_t*)va_arg (ap, const 
vout_display_cfg_t *);
                 }
 
@@ -395,7 +392,7 @@ static int Control (vout_display_t *vd, int query, va_list 
ap)
                 cfg_tmp.display.height = bounds.size.height;
 
                 vout_display_place_t place;
-                vout_display_PlacePicture (&place, source, &cfg_tmp, false);
+                vout_display_PlacePicture (&place, &vd->source, &cfg_tmp, 
false);
                 @synchronized (sys->glView) {
                     sys->place = place;
                 }

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to