Merge branch 'master' into whisper-8e46ba8
This commit is contained in:
commit
f2d528e3c1
1 changed files with 1 additions and 1 deletions
|
|
@ -427,7 +427,7 @@ impl<'a, 'b> FullParams<'a, 'b> {
|
|||
}
|
||||
None => {
|
||||
self.fp.progress_callback = None;
|
||||
self.fp.progress_callback_user_data = 0 as *mut c_void;
|
||||
self.fp.progress_callback_user_data = std::ptr::null_mut::<c_void>();
|
||||
self.progess_callback_safe = None;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue