1 files changed, 7 insertions, 4 deletions
diff --git a/src/internal.h b/src/internal.h
index cc0701c..51962a2 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -82,8 +82,10 @@ struct Dav1dContext {
     int n_tile_data_alloc;
     int n_tile_data;
     int n_tiles;
+    Dav1dMemPool seq_hdr_pool;
     Dav1dRef *seq_hdr_ref;
     Dav1dSequenceHeader *seq_hdr;
+    Dav1dMemPool frame_hdr_pool;
     Dav1dRef *frame_hdr_ref;
     Dav1dFrameHeader *frame_hdr;
 
@@ -107,12 +109,15 @@ struct Dav1dContext {
     } frame_thread;
 
     // reference/entropy state
+    Dav1dMemPool segmap_pool;
+    Dav1dMemPool refmvs_pool;
     struct {
         Dav1dThreadPicture p;
         Dav1dRef *segmap;
         Dav1dRef *refmvs;
         unsigned refpoc[7];
     } refs[8];
+    Dav1dMemPool cdf_pool;
     CdfThreadContext cdf[8];
 
     Dav1dDSPContext dsp[3 /* 8, 10, 12 bits/component */];
@@ -136,10 +141,8 @@ struct Dav1dContext {
 
     Dav1dLogger logger;
 
-    struct {
-        pthread_mutex_t lock;
-        Dav1dPictureBuffer *buf;
-    } picture_buffer_pool;
+    Dav1dMemPool picture_pool;
+    int mem_pools_inited;
 };
 
 struct Dav1dFrameContext {