diff --git a/.travis.yml b/.travis.yml index c59c5a04..c79c35eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,4 +32,4 @@ before_install: - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then brew install yasm; fi script: | - travis_wait cargo build --verbose --features "build" + travis_wait cargo build --examples --verbose --features "build" diff --git a/Cargo.toml b/Cargo.toml index 008a4904..e345bad0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ffmpeg4" -version = "0.4.0" +version = "0.4.3" build = "build.rs" authors = [ @@ -97,7 +97,7 @@ version = "0.22" optional = true [dependencies.ffmpeg4-sys] -version = "4.2" -default-features = false -# Temporary change it +version = "4.3" git = "https://github.com/bacek/rust-ffmpeg4-sys" +branch = "release/4.3" +default-features = false diff --git a/src/software/resampling/context.rs b/src/software/resampling/context.rs index 67a7c215..730176ec 100644 --- a/src/software/resampling/context.rs +++ b/src/software/resampling/context.rs @@ -112,16 +112,10 @@ impl Context { output: &mut frame::Audio, ) -> Result, Error> { output.set_rate(self.output.rate); + output.set_format(self.output.format); + output.set_channel_layout(self.output.channel_layout); unsafe { - if output.is_empty() { - output.alloc( - self.output.format, - input.samples(), - self.output.channel_layout, - ); - } - match swr_convert_frame(self.as_mut_ptr(), output.as_mut_ptr(), input.as_ptr()) { 0 => Ok(self.delay()), @@ -135,6 +129,8 @@ impl Context { /// When there are no more internal frames `Ok(None)` will be returned. pub fn flush(&mut self, output: &mut frame::Audio) -> Result, Error> { output.set_rate(self.output.rate); + output.set_format(self.output.format); + output.set_channel_layout(self.output.channel_layout); unsafe { match swr_convert_frame(self.as_mut_ptr(), output.as_mut_ptr(), ptr::null()) { diff --git a/src/util/color/primaries.rs b/src/util/color/primaries.rs index a9d2655f..149d28b2 100644 --- a/src/util/color/primaries.rs +++ b/src/util/color/primaries.rs @@ -18,7 +18,7 @@ pub enum Primaries { SMPTE428, SMPTE431, SMPTE432, - JEDEC_P22, + EBU3213, } impl From for Primaries { @@ -40,7 +40,7 @@ impl From for Primaries { AVCOL_PRI_SMPTE428 => Primaries::SMPTE428, AVCOL_PRI_SMPTE431 => Primaries::SMPTE431, AVCOL_PRI_SMPTE432 => Primaries::SMPTE432, - AVCOL_PRI_JEDEC_P22 => Primaries::JEDEC_P22, + AVCOL_PRI_EBU3213 => Primaries::EBU3213, } } } @@ -63,7 +63,7 @@ impl Into for Primaries { Primaries::SMPTE428 => AVCOL_PRI_SMPTE428, Primaries::SMPTE431 => AVCOL_PRI_SMPTE431, Primaries::SMPTE432 => AVCOL_PRI_SMPTE432, - Primaries::JEDEC_P22 => AVCOL_PRI_JEDEC_P22, + Primaries::EBU3213 => AVCOL_PRI_EBU3213, } } }