Index: trunk/ppStack/src/ppStackCamera.c
===================================================================
--- trunk/ppStack/src/ppStackCamera.c	(revision 16862)
+++ trunk/ppStack/src/ppStackCamera.c	(revision 16913)
@@ -252,40 +252,9 @@
     output->save = true;
 
-    // Generate the correct structure
-    pmFPALevel phuLevel = pmFPAPHULevel(output->format); // Level at which PHU goes
-    pmFPAview *view = pmFPAviewAlloc(0);// View for current level
-    if (phuLevel == PM_FPA_LEVEL_FPA) {
-        if (!pmFPAAddSourceFromView(fpa, "Stack", view, output->format)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
-            psFree(fpa);
-            psFree(view);
-            return NULL;
-        }
-    } else {
-        pmChip *chip;                       // Chip from FPA
-        while ((chip = pmFPAviewNextChip(view, fpa, 1))) {
-            if (phuLevel == PM_FPA_LEVEL_CHIP) {
-                if (!pmFPAAddSourceFromView(fpa, "Stack", view, output->format)) {
-                    psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
-                    psFree(fpa);
-                    psFree(view);
-                    return NULL;
-                }
-            } else {
-                pmCell *cell;                   // Cell from chip
-                while ((cell = pmFPAviewNextCell(view, fpa, 1))) {
-                    if (phuLevel == PM_FPA_LEVEL_CELL) {
-                        if (!pmFPAAddSourceFromView(fpa, "Stack", view, output->format)) {
-                            psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
-                            psFree(fpa);
-                            psFree(view);
-                            return NULL;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    psFree(view);
+    if (!pmFPAAddSourceFromFormat(fpa, "Stack", output->format)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to generate output FPA.");
+        psFree(fpa);
+        return false;
+    }
 
     // Output mask