From 9eab7820bb5ea6125c6b81ecc1f8aaff08a217ae Mon Sep 17 00:00:00 2001 From: FreezyLemon Date: Wed, 3 Apr 2024 20:51:12 +0200 Subject: [PATCH] Fix PadIter in FFmpeg pre-5.0 (#17) --- src/filter/filter.rs | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/src/filter/filter.rs b/src/filter/filter.rs index 070bbc5..3ed3db1 100644 --- a/src/filter/filter.rs +++ b/src/filter/filter.rs @@ -48,19 +48,11 @@ impl Filter { None } else { #[cfg(feature = "ffmpeg_5_0")] - { - Some(PadIter::new( - (*self.as_ptr()).inputs, - (*self.as_ptr()).nb_inputs as isize, - )) - } + let count = (*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, - )) - } + let count = avfilter_pad_count(ptr) as isize; + + Some(PadIter::new(ptr, count)) } } } @@ -73,19 +65,11 @@ impl Filter { None } else { #[cfg(feature = "ffmpeg_5_0")] - { - Some(PadIter::new( - (*self.as_ptr()).outputs, - (*self.as_ptr()).nb_outputs as isize, - )) - } + let count = (*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, - )) - } + let count = avfilter_pad_count(ptr) as isize; + + Some(PadIter::new(ptr, count)) } } }