vout ios: fix autorelease pool leak on error (closes #15402)

modules/video_output/ios2.m

@@ -219,7 +219,6 @@ static int Open(vlc_object_t *this)
         return VLC_EGENERIC;
 
     vout_display_sys_t *sys = calloc (1, sizeof(*sys));
-    NSAutoreleasePool *autoreleasePool = nil;
 
     if (!sys)
         return VLC_ENOMEM;
@@ -228,8 +227,7 @@ static int Open(vlc_object_t *this)
     sys->picturePool = NULL;
     sys->gl.sys = NULL;
 
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
+    @autoreleasepool {
         /* get the object we will draw into */
         UIView* viewContainer = var_CreateGetAddress (vd, "drawable-nsobject");
         if (unlikely(viewContainer == nil))
@@ -333,14 +331,12 @@ static int Open(vlc_object_t *this)
         [sys->glESView performSelectorOnMainThread:@selector(reshape)
                                         withObject:nil
                                      waitUntilDone:YES];
-
-    [autoreleasePool release];
         return VLC_SUCCESS;
         
-bailout:
-    [autoreleasePool release];
+    bailout:
         Close(this);
         return VLC_EGENERIC;
+    }
 }
 
 void Close (vlc_object_t *this)
@@ -348,6 +344,7 @@ void Close (vlc_object_t *this)
     vout_display_t *vd = (vout_display_t *)this;
     vout_display_sys_t *sys = vd->sys;
 
+    @autoreleasepool {
         if (sys->tapRecognizer) {
             [sys->tapRecognizer.view removeGestureRecognizer:sys->tapRecognizer];
             [sys->tapRecognizer release];
@@ -377,6 +374,7 @@ void Close (vlc_object_t *this)
         }
         
         free(sys);
+    }
 }
 
 /*****************************************************************************
@@ -400,12 +398,12 @@ static int Control(vout_display_t *vd, int query, va_list ap)
             if (!vd->sys)
                 return VLC_EGENERIC;
 
-            NSAutoreleasePool * autoreleasePool = [[NSAutoreleasePool alloc] init];
-
+            @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) {
+                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 {
@@ -436,8 +434,7 @@ static int Control(vout_display_t *vd, int query, va_list ap)
                 // x / y are top left corner, but we need the lower left one
                 if (query != VOUT_DISPLAY_CHANGE_DISPLAY_SIZE)
                     glViewport(place.x, cfg_tmp.display.height - (place.y + place.height), place.width, place.height);
-
-            [autoreleasePool release];
+            }
             return VLC_SUCCESS;
         }