Add 2nd lockfail test and move pixel aspect ratio

src/rgb_to_fb.S

@@ -707,6 +707,10 @@ noInBandData:
         bl     wait_for_vsync               //wait for field sync as sometimes the update will be on the ragged edge of finishing during field sync causing glitches
         pop    {r1-r5, r11}
 
+        ldr    r6, lock_fail
+        cmp    r6,#0
+        bne    lock_failed
+
 force_osd_update:
         push   {r1-r5, r11}
         mov    r0, r11

src/rgb_to_hdmi.c

@@ -2510,6 +2510,8 @@ int show_detected_status(int line) {
     osd_set(line++, 0, message);
     sprintf(message, "      Sync type: %s", sync_names_long[capinfo->detected_sync_type & SYNC_BIT_MASK]);
     osd_set(line++, 0, message);
+    sprintf(message, "   Pixel Aspect: %d:%d", get_haspect(), get_vaspect());
+    osd_set(line++, 0, message);
     int double_width = (capinfo->sizex2 & 2) >> 1;
     int double_height = capinfo->sizex2 & 1;
     sprintf(message, "   Capture Size: %dx%d  (%dx%d)", capinfo->chars_per_line << (3 - double_width), capinfo->nlines, capinfo->chars_per_line << 3, capinfo->nlines << double_height );
@@ -2518,8 +2520,6 @@ int show_detected_status(int line) {
     osd_set(line++, 0, message);
     sprintf(message, "   Frame Buffer: %d x %d", capinfo->width, capinfo->height);
     osd_set(line++, 0, message);
-    sprintf(message, "   Pixel Aspect: %d:%d", get_haspect(), get_vaspect());
-    osd_set(line++, 0, message);
     int h_size = get_hdisplay();
     int v_size = get_vdisplay();
     sprintf(message, "  Pi Resolution: %d x %d", h_size, v_size);