rebase master

commaai · Jan 18, 2021 · a72f77d · a72f77d
1 parent 18c3417
commit a72f77d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/selfdrive/common/queue.h b/selfdrive/common/queue.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <condition_variable>
 #include <mutex>
 #include <queue>

diff --git a/selfdrive/loggerd/omx_encoder.cc b/selfdrive/loggerd/omx_encoder.cc
@@ -330,7 +330,7 @@ OmxEncoder::OmxEncoder(const char* filename, int width, int height, int fps, int
 
   // fill the input free queue
   for (auto &buf : this->in_buf_headers) {
-    queue_push(&this->free_in, (void*)buf);
+    this->free_in.push(buf);
   }
 }