Skip to content

Commit

Permalink
Merge pull request #60 from nomalab/update_build
Browse files Browse the repository at this point in the history
Update build
  • Loading branch information
Romanelaf authored Oct 24, 2024
2 parents 5e8d0a3 + 787ab16 commit b8451be
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,16 @@ jobs:
fail-fast: false
matrix:
rust: [
1.71.0,
1.72.0,
1.73.0,
1.74.0,
1.75.0,
1.76.0,
1.77.0,
1.78.0,
1.79.0,
1.80.0,
1.81.0,
1.82.0,
stable,
beta,
nightly
Expand Down Expand Up @@ -61,7 +63,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
toolchain: 1.82.0
default: true
components: rustfmt

Expand All @@ -82,7 +84,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
toolchain: 1.82.0
default: true
components: clippy

Expand All @@ -102,7 +104,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
toolchain: 1.82.0
default: true

- name: Install tarpaulin
Expand Down
1 change: 1 addition & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ fn main() {
_ => None,
};

println!("cargo:rustc-check-cfg=cfg(ffmpeg_4_0, ffmpeg_4_1, ffmpeg_4_2, ffmpeg_4_3, ffmpeg_4_4, ffmpeg_5_0, ffmpeg_5_1)");
if let Some(ffmpeg_version) = ffmpeg_version {
// println!("cargo:warning={}", ffmpeg_version);
println!("cargo:rustc-cfg={ffmpeg_version}");
Expand Down
2 changes: 1 addition & 1 deletion src/stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ impl Stream {
for _i in 0..4 {
let character = codec_tag & 0xFF;
if let Some(c) = char::from_u32(character) {
codec_tag_str.push_str(&c.to_string());
codec_tag_str.push(c);
}
codec_tag >>= 8;
}
Expand Down

0 comments on commit b8451be

Please sign in to comment.