Fix ffmpeg 4.x
This commit is contained in:
parent
3954c3002d
commit
e3d3c4a11e
12
CHANGELOG.md
12
CHANGELOG.md
@ -1,3 +1,15 @@
|
|||||||
|
## Version 1.2.1
|
||||||
|
|
||||||
|
- Fix ffmpeg 4.x support that was broken in 1.2.0
|
||||||
|
|
||||||
|
## Version 1.2.0
|
||||||
|
|
||||||
|
- Add ffmpeg 6.0 support
|
||||||
|
|
||||||
|
## _sys_ Version 1.1.0
|
||||||
|
|
||||||
|
- Add ffmpeg 6.0 support
|
||||||
|
|
||||||
## _sys_ Version 1.0.2
|
## _sys_ Version 1.0.2
|
||||||
|
|
||||||
- Fix building against clang 16 by using latest bindgen crate
|
- Fix building against clang 16 by using latest bindgen crate
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "ffmpeg-the-third"
|
name = "ffmpeg-the-third"
|
||||||
version = "1.2.0+ffmpeg-6.0.0"
|
version = "1.2.1+ffmpeg-6.0.0"
|
||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
|
|
||||||
authors = ["meh. <meh@schizofreni.co>", "Zhiming Wang <i@zhimingwang.org>"]
|
authors = ["meh. <meh@schizofreni.co>", "Zhiming Wang <i@zhimingwang.org>"]
|
||||||
|
@ -47,11 +47,21 @@ impl Filter {
|
|||||||
if ptr.is_null() {
|
if ptr.is_null() {
|
||||||
None
|
None
|
||||||
} else {
|
} else {
|
||||||
|
#[cfg(feature = "ffmpeg_5_0")]
|
||||||
|
{
|
||||||
Some(PadIter::new(
|
Some(PadIter::new(
|
||||||
(*self.as_ptr()).inputs,
|
(*self.as_ptr()).inputs,
|
||||||
(*self.as_ptr()).nb_inputs as isize,
|
(*self.as_ptr()).nb_inputs as isize,
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
#[cfg(not(feature = "ffmpeg_5_0"))]
|
||||||
|
{
|
||||||
|
Some(PadIter::new(
|
||||||
|
(*self.as_ptr()).inputs,
|
||||||
|
(*self.as_ptr()).inputs as isize,
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -62,11 +72,21 @@ impl Filter {
|
|||||||
if ptr.is_null() {
|
if ptr.is_null() {
|
||||||
None
|
None
|
||||||
} else {
|
} else {
|
||||||
|
#[cfg(feature = "ffmpeg_5_0")]
|
||||||
|
{
|
||||||
Some(PadIter::new(
|
Some(PadIter::new(
|
||||||
(*self.as_ptr()).outputs,
|
(*self.as_ptr()).outputs,
|
||||||
(*self.as_ptr()).nb_outputs as isize,
|
(*self.as_ptr()).nb_outputs as isize,
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
#[cfg(not(feature = "ffmpeg_5_0"))]
|
||||||
|
{
|
||||||
|
Some(PadIter::new(
|
||||||
|
(*self.as_ptr()).outputs,
|
||||||
|
(*self.as_ptr()).outputs as isize,
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user