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

vout/caopengllayer: 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=df3f71dd0f4c58c65e22b9f6429f42de9969b540
---

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

diff --git a/modules/video_output/caopengllayer.m 
b/modules/video_output/caopengllayer.m
index 430531b2c4..c16687c1a0 100644
--- a/modules/video_output/caopengllayer.m
+++ b/modules/video_output/caopengllayer.m
@@ -333,13 +333,10 @@ static int Control (vout_display_t *vd, int query, 
va_list ap)
         case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
         {
             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 *);
             }
 
@@ -352,7 +349,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);
             if (OpenglLock(sys->gl))
                 return VLC_EGENERIC;
 

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

Reply via email to