vlc | branch: master | Steve Lhomme <rob...@videolabs.io> | Mon Aug  7 12:58:01 
2017 +0200| [d2427557695c482f330a9f61d33d586a920ef8cb] | committer: Marvin 
Scholz

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

Signed-off-by: Marvin Scholz <epira...@gmail.com>

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

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

diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index b6331428ed..bbc1e411ec 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -293,14 +293,11 @@ static int Control(vout_display_t *vd, int query, va_list 
ap)
 
             @autoreleasepool {
                 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 *);
                 }
 
@@ -319,7 +316,7 @@ static int Control(vout_display_t *vd, int query, va_list 
ap)
                 cfg_tmp.display.height = viewSize.height * scaleFactor;
 
                 vout_display_place_t place;
-                vout_display_PlacePicture(&place, source, &cfg_tmp, false);
+                vout_display_PlacePicture(&place, &vd->source, &cfg_tmp, 
false);
                 @synchronized (sys->glESView) {
                     sys->place = place;
                 }

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

Reply via email to