Index: /branches/reyalp-flt/platform/s95/lib.c
===================================================================
--- /branches/reyalp-flt/platform/s95/lib.c	(revision 1517)
+++ /branches/reyalp-flt/platform/s95/lib.c	(revision 1518)
@@ -60,2 +60,19 @@
    _PostLogicalEventForNotPowerType(0x1005,0);
 }
+
+
+int vid_get_viewport_width()
+{
+	return 360;
+}
+
+long vid_get_viewport_height()
+{
+   return 240;
+
+}
+
+// Y multiplier for cameras with 480 pixel high viewports (CHDK code assumes 240)
+int vid_get_viewport_yscale() {
+	return 2;               // G12 viewport is 480 pixels high
+}
Index: /branches/reyalp-flt/platform/s95/sub/100e/lib.c
===================================================================
--- /branches/reyalp-flt/platform/s95/sub/100e/lib.c	(revision 1517)
+++ /branches/reyalp-flt/platform/s95/sub/100e/lib.c	(revision 1518)
@@ -76,15 +76,2 @@
     return (char*) 0xBBC9C;						// @FFA3ACC4 - ok
 }
-
-
-int vid_get_viewport_width()
-{
-	return 720;
-}
-
-
-long vid_get_viewport_height()
-{
-   return 240;
-
-}
Index: /branches/reyalp-flt/platform/s95/sub/100h/lib.c
===================================================================
--- /branches/reyalp-flt/platform/s95/sub/100h/lib.c	(revision 1517)
+++ /branches/reyalp-flt/platform/s95/sub/100h/lib.c	(revision 1518)
@@ -76,15 +76,2 @@
     return (char*) 0xBBC9C;						// @FFA3ACC4 - ok
 }
-
-
-int vid_get_viewport_width()
-{
-	return 720;
-}
-
-
-long vid_get_viewport_height()
-{
-   return 240;
-
-}
Index: /branches/reyalp-flt/platform/s95/sub/100i/lib.c
===================================================================
--- /branches/reyalp-flt/platform/s95/sub/100i/lib.c	(revision 1517)
+++ /branches/reyalp-flt/platform/s95/sub/100i/lib.c	(revision 1518)
@@ -76,15 +76,2 @@
     return (char*) 0xBBC9C;						// @FFA3ACC4 - ok
 }
-
-
-int vid_get_viewport_width()
-{
-	return 720;
-}
-
-
-long vid_get_viewport_height()
-{
-   return 240;
-
-}
Index: /branches/reyalp-flt/platform/s95/sub/100k/lib.c
===================================================================
--- /branches/reyalp-flt/platform/s95/sub/100k/lib.c	(revision 1517)
+++ /branches/reyalp-flt/platform/s95/sub/100k/lib.c	(revision 1518)
@@ -76,15 +76,2 @@
     return (char*) 0xBBC9C;						// @FFA3ACC4 - ok
 }
-
-
-int vid_get_viewport_width()
-{
-	return 720;
-}
-
-
-long vid_get_viewport_height()
-{
-   return 240;
-
-}