Index: /branches/reyalp-ptp-live/core/live_view.c
===================================================================
--- /branches/reyalp-ptp-live/core/live_view.c	(revision 1830)
+++ /branches/reyalp-ptp-live/core/live_view.c	(revision 1831)
@@ -19,6 +19,4 @@
 
     lv.vp.buffer_width = vid_get_viewport_buffer_width_proper();
-    // TODO will go away, always the same as visible
-    lv.vp.buffer_height = vid_get_viewport_height_proper();
 
     // TODO
@@ -33,6 +31,4 @@
 
     lv.bm.buffer_width = camera_screen.buffer_width;
-    // TODO will go away
-    lv.bm.buffer_height = camera_screen.height;
 
     lv.bm.buffer_logical_xoffset = 0;
@@ -66,5 +62,5 @@
     {
         lv.bm.data_start = total_size;
-        bm_size = camera_screen.buffer_width*camera_screen.buffer_height;
+        bm_size = lv.bm.buffer_width*lv.bm.visible_height;
         total_size += bm_size;
     }
Index: /branches/reyalp-ptp-live/core/live_view.h
===================================================================
--- /branches/reyalp-ptp-live/core/live_view.h	(revision 1830)
+++ /branches/reyalp-ptp-live/core/live_view.h	(revision 1831)
@@ -3,5 +3,4 @@
 
 // Live View protocol version
-// TODO need to put this somewhere
 #define LIVE_VIEW_VERSION_MAJOR 2  // increase only with backwards incompatible changes (and reset minor)
 #define LIVE_VIEW_VERSION_MINOR 0  // increase with extensions of functionality
@@ -33,6 +32,4 @@
     */
     int buffer_width;
-    // TODO will go away
-    int buffer_height;
 
     int buffer_logical_xoffset;