Fix merge errors

memorysafety · Apr 23, 2024 · 957c4fb · 957c4fb
1 parent 012114f
commit 957c4fb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/recon.rs b/src/recon.rs
@@ -24,8 +24,8 @@ use crate::src::internal::Rav1dContext;
 use crate::src::internal::Rav1dDSPContext;
 use crate::src::internal::Rav1dFrameData;
 use crate::src::internal::Rav1dTaskContext;
-use crate::src::internal::Rav1dTaskContext_scratch;
 use crate::src::internal::ScratchEmuEdge;
+use crate::src::internal::TaskContextScratch;
 use crate::src::internal::TileStateRef;
 use crate::src::intra_edge::EdgeFlags;
 use crate::src::ipred_prepare::rav1d_prepare_intra_edges;
@@ -482,7 +482,7 @@ unsafe fn decode_coefs<BD: BitDepth>(
     f: &Rav1dFrameData,
     ts: usize,
     dbg_block_info: bool,
-    scratch: &mut Rav1dTaskContext_scratch,
+    scratch: &mut TaskContextScratch,
     t_cf: &mut BitDepthUnion<Cf>,
     a: &mut [u8],
     l: &mut [u8],