Write 1.4.0 changelog.

[nageru] / pbo_frame_allocator.cpp

diff --git a/pbo_frame_allocator.cpp b/pbo_frame_allocator.cpp
index 0020ba484878ee70a0a560b885a58c9493bda9e9..d18358a3121b7cf131de211df446a62b098db1e6 100644 (file)
--- a/pbo_frame_allocator.cpp
+++ b/pbo_frame_allocator.cpp
@@ -1,12 +1,12 @@
 #include "pbo_frame_allocator.h"
 
+#include <bmusb/bmusb.h>
+#include <movit/util.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <cstddef>
 
-#include <movit/util.h>
-
 using namespace std;
 
 PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint height, size_t num_queued_frames, GLenum buffer, GLenum permissions, GLenum map_bits)
@@ -45,6 +45,7 @@ PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint hei
                userdata[i].last_height[1] = 0;
                userdata[i].last_interlaced = false;
                userdata[i].last_has_signal = false;
+               userdata[i].last_is_connected = false;
                for (unsigned field = 0; field < 2; ++field) {
                        glBindTexture(GL_TEXTURE_2D, userdata[i].tex_y[field]);
                        check_error();
@@ -103,7 +104,7 @@ PBOFrameAllocator::~PBOFrameAllocator()
 }
 //static int sumsum = 0;
 
-FrameAllocator::Frame PBOFrameAllocator::alloc_frame()
+bmusb::FrameAllocator::Frame PBOFrameAllocator::alloc_frame()
 {
         Frame vf;