From b358b3e4209da827e021d979c7d35876594d0285 Mon Sep 17 00:00:00 2001 From: kieran Date: Wed, 11 Dec 2024 10:44:17 +0000 Subject: [PATCH] fix: mux build ff_api* --- src/mux.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/mux.rs b/src/mux.rs index b4ddf5d..8e7e67c 100644 --- a/src/mux.rs +++ b/src/mux.rs @@ -10,13 +10,17 @@ use ffmpeg_sys_the_third::{ }; use slimbox::{slimbox_unsize, SlimBox, SlimMut}; use std::collections::HashMap; -use std::io::{Read, Seek, SeekFrom, Write}; +use std::io::{Seek, SeekFrom, Write}; use std::{ptr, slice}; +#[cfg(feature = "ff_api_avio_write_nonconst")] +type WriteDataPtr = *mut u8; +#[cfg(not(feature = "ff_api_avio_write_nonconst"))] +type WriteDataPtr = *const u8; + unsafe extern "C" fn write_data( opaque: *mut libc::c_void, - #[cfg(feature = "avformat_version_greater_than_60_12")] buffer: *const u8, - #[cfg(not(feature = "avformat_version_greater_than_60_12"))] buffer: *mut u8, + buffer: WriteDataPtr, size: libc::c_int, ) -> libc::c_int where @@ -392,7 +396,7 @@ impl Muxer { impl Drop for Muxer { fn drop(&mut self) { unsafe { - self.free_ctx(); + self.free_ctx().expect("drop muxer"); } } }