X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fbinkvid.rs;h=9c0dc9e37dd976780c48263dd091377b89794767;hb=f27c73df2e609d8d96790333d8aad65ddd6f0df4;hp=5f5bb566aa528603e7b3515f5f813f4bdd468e2f;hpb=78fb6560c73965d834b215fb0b49505ae5443288;p=nihav.git

diff --git a/nihav-rad/src/codecs/binkvid.rs b/nihav-rad/src/codecs/binkvid.rs
index 5f5bb56..9c0dc9e 100644
--- a/nihav-rad/src/codecs/binkvid.rs
+++ b/nihav-rad/src/codecs/binkvid.rs
@@ -385,14 +385,14 @@ fn map_u8(idx: usize) -> u8 { idx as u8 }
 
 impl Default for BinkTrees {
     fn default() -> Self {
-        let mut cb: [Codebook<u8>; 16];
-        unsafe {
-            cb = std::mem::uninitialized();
-            for i in 0..16 {
-                let mut cr = TableCodebookDescReader::new(&BINK_TREE_CODES[i], &BINK_TREE_BITS[i], map_u8);
-                std::ptr::write(&mut cb[i], Codebook::new(&mut cr, CodebookMode::LSB).unwrap());
-            }
-        }
+        let cb = unsafe {
+                let mut ucb: std::mem::MaybeUninit::<[Codebook<u8>; 16]> = std::mem::MaybeUninit::uninit();
+                for i in 0..16 {
+                    let mut cr = TableCodebookDescReader::new(&BINK_TREE_CODES[i], &BINK_TREE_BITS[i], map_u8);
+                    std::ptr::write(&mut (*ucb.as_mut_ptr())[i], Codebook::new(&mut cr, CodebookMode::LSB).unwrap());
+                }
+                ucb.assume_init()
+            };
         Self { cb }
     }
 }