Skip to content

Commit

Permalink
Update rusty_ffmpeg to 0.16.1 (#189)
Browse files Browse the repository at this point in the history
* Update `rusty_ffmpeg` to `0.16.1`

* fix clippy

* Update Windows CI check
  • Loading branch information
ldm0 authored Aug 26, 2024
1 parent b1f9bee commit 0319be7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ jobs:
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
LIBCLANG_PATH: ${{ github.workspace }}/clang/lib
LLVM_CONFIG_PATH: ${{ github.workspace }}/clang/bin/llvm-config
# vcpkg doesn't provide FFmpeg 7 yet (https://github.com/microsoft/vcpkg/issues/37888)
run: cargo clippy --no-default-features --features ffmpeg6 -- -D warnings
run: cargo clippy --no-default-features --features ffmpeg7,link_vcpkg_ffmpeg -- -D warnings

build_static_and_test_ubuntu:
runs-on: ubuntu-latest
Expand Down
6 changes: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ exclude = ["/.github", "/tests", "/utils"]
rust-version = "1.70.0"

[dependencies]
rusty_ffmpeg = "0.14.0"
rusty_ffmpeg = "0.16.1"
paste = "1.0"
thiserror = "1.0"

Expand All @@ -34,5 +34,7 @@ default = ["ffmpeg7"]
ffmpeg6 = ["rusty_ffmpeg/ffmpeg6"]
ffmpeg7 = ["ffmpeg6", "rusty_ffmpeg/ffmpeg7"]

# linking system ffmpeg as fallback.
# Try linking ffmpeg with pkg-config.
link_system_ffmpeg = ["rusty_ffmpeg/link_system_ffmpeg"]
# Try linking ffmpeg with vcpkg.
link_vcpkg_ffmpeg = ["rusty_ffmpeg/link_vcpkg_ffmpeg"]
3 changes: 1 addition & 2 deletions src/avformat/avformat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ impl AVFormatContextInput {
/// all streams.
///
/// - `url`: url of the stream to open.
/// - `format`: input format hint. If `format` is some, this parameter forces
/// a specific input format.
/// - `format`: input format hint. If `format` is some, this parameter forces a specific input format.
/// - `options`: A dictionary filled with AVFormatContext and demuxer-private options.
/// On return this parameter will be destroyed and replaced with a dict containing
/// options that were not found.
Expand Down
1 change: 1 addition & 0 deletions src/swresample/swresample.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ impl SwrContext {
/// - if it's the least common multiple of in_sample_rate and
/// out_sample_rate then an exact rounding-free delay will be
/// returned
///
/// returns the delay in `1 / base` base units.
pub fn get_delay(&self, base: usize) -> usize {
unsafe { ffi::swr_get_delay(self.as_ptr() as *mut _, base.try_into().unwrap()) }
Expand Down

0 comments on commit 0319be7

Please sign in to comment.