Merge branch 'mjpeg'

[nageru] / nageru / pbo_frame_allocator.cpp

diff --git a/pbo_frame_allocator.cpp b/nageru/pbo_frame_allocator.cpp
similarity index 100%
rename from pbo_frame_allocator.cpp
rename to nageru/pbo_frame_allocator.cpp