From c84e7fbb6dcb420bebac45250fd99a1dc2409e25 Mon Sep 17 00:00:00 2001 From: Khyber Sen Date: Thu, 18 Apr 2024 18:39:08 -0700 Subject: [PATCH] `struct Rav1dContext::refmvs_pool`: Remove (for now) now-unused `refmvs_pool` now that `mvs`s have been `Arc`ified. --- src/internal.rs | 1 - src/lib.rs | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/internal.rs b/src/internal.rs index c660b60c1..c5cf2fc60 100644 --- a/src/internal.rs +++ b/src/internal.rs @@ -285,7 +285,6 @@ pub struct Rav1dContext { pub(crate) task_thread: Arc, // reference/entropy state - pub(crate) refmvs_pool: *mut Rav1dMemPool, pub(crate) refs: [Rav1dContext_refs; 8], pub(crate) cdf_pool: *mut Rav1dMemPool, pub(crate) cdf: [CdfThreadContext; 8], diff --git a/src/lib.rs b/src/lib.rs index d9ae6ac72..29722f122 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -217,9 +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).refmvs_pool).is_err() - || rav1d_mem_pool_init(&mut (*c).cdf_pool).is_err() - { + if rav1d_mem_pool_init(&mut (*c).cdf_pool).is_err() { return error(c, c_out); } if (*c).allocator.alloc_picture_callback == dav1d_default_picture_alloc @@ -858,7 +856,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.refmvs_pool); rav1d_mem_pool_end(self.cdf_pool); rav1d_mem_pool_end(self.picture_pool); }