diff --git a/src/internal.rs b/src/internal.rs index bb636c9d2..ba672eeee 100644 --- a/src/internal.rs +++ b/src/internal.rs @@ -284,7 +284,6 @@ pub struct Rav1dContext { pub(crate) task_thread: Arc, // reference/entropy state - pub(crate) segmap_pool: *mut Rav1dMemPool, pub(crate) refmvs_pool: *mut Rav1dMemPool, pub(crate) refs: [Rav1dContext_refs; 8], pub(crate) cdf_pool: *mut Rav1dMemPool, @@ -717,7 +716,7 @@ pub(crate) struct Rav1dFrameData { pub mvs: *mut refmvs_temporal_block, pub ref_mvs: [*mut refmvs_temporal_block; 7], pub ref_mvs_ref: [*mut Rav1dRef; 7], - pub cur_segmap: Option>, + pub cur_segmap: Option>, // Previously pooled. pub prev_segmap: Option>, pub refpoc: [c_uint; 7], pub refrefpoc: [[c_uint; 7]; 7], diff --git a/src/lib.rs b/src/lib.rs index 9049ca383..26aa775e4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -217,8 +217,7 @@ pub(crate) unsafe fn rav1d_open(c_out: &mut *mut Rav1dContext, s: &Rav1dSettings (*c).inloop_filters = s.inloop_filters; (*c).decode_frame_type = s.decode_frame_type; (*c).cached_error_props = Default::default(); - if rav1d_mem_pool_init(&mut (*c).segmap_pool).is_err() - || rav1d_mem_pool_init(&mut (*c).refmvs_pool).is_err() + if rav1d_mem_pool_init(&mut (*c).refmvs_pool).is_err() || rav1d_mem_pool_init(&mut (*c).cdf_pool).is_err() { return error(c, c_out); @@ -862,7 +861,6 @@ impl Drop for Rav1dContext { let _ = mem::take(&mut self.mastering_display); let _ = mem::take(&mut self.content_light); let _ = mem::take(&mut self.itut_t35); - rav1d_mem_pool_end(self.segmap_pool); rav1d_mem_pool_end(self.refmvs_pool); rav1d_mem_pool_end(self.cdf_pool); rav1d_mem_pool_end(self.picture_pool);