fn dav1d_refmvs_dsp_init: Deduplicate declarations into use imports.

memorysafety · Sep 25, 2023 · ac3f2b9 · ac3f2b9
1 parent 0f5ea78
commit ac3f2b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -70,8 +70,8 @@ use crate::src::picture::PICTURE_FLAG_NEW_TEMPORAL_UNIT;
 use crate::src::r#ref::dav1d_ref_dec;
 use crate::src::r#ref::Dav1dRef;
 use crate::src::refmvs::dav1d_refmvs_clear;
+use crate::src::refmvs::dav1d_refmvs_dsp_init;
 use crate::src::refmvs::dav1d_refmvs_init;
-use crate::src::refmvs::Dav1dRefmvsDSPContext;
 use crate::src::thread_task::dav1d_task_delayed_fg;
 use crate::src::thread_task::dav1d_worker_task;
 use crate::src::thread_task::FRAME_ERROR;
@@ -131,7 +131,6 @@ extern "C" {
         __start_routine: Option<unsafe extern "C" fn(*mut c_void) -> *mut c_void>,
         __arg: *mut c_void,
     ) -> c_int;
-    fn dav1d_refmvs_dsp_init(dsp: *mut Dav1dRefmvsDSPContext);
     fn pthread_once(
         __once_control: *mut pthread_once_t,
         __init_routine: Option<unsafe extern "C" fn() -> ()>,

diff --git a/src/refmvs.rs b/src/refmvs.rs
@@ -1659,9 +1659,8 @@ unsafe extern "C" fn refmvs_dsp_init_arm(c: *mut Dav1dRefmvsDSPContext) {
     }
 }
 
-#[no_mangle]
 #[cold]
-pub unsafe extern "C" fn dav1d_refmvs_dsp_init(c: *mut Dav1dRefmvsDSPContext) {
+pub unsafe fn dav1d_refmvs_dsp_init(c: *mut Dav1dRefmvsDSPContext) {
     (*c).load_tmvs = Some(load_tmvs_c);
     (*c).save_tmvs = Some(save_tmvs_c);
     (*c).splat_mv = Some(splat_mv_rust);