diff --git a/Cargo.toml b/Cargo.toml index 0c65c12..e8611a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ffmpeg-the-third" -version = "1.1.2+ffmpeg-5.1.2" +version = "1.2.0+ffmpeg-6.0.0" build = "build.rs" authors = ["meh. ", "Zhiming Wang "] diff --git a/ffmpeg-sys-the-third/.github/workflows/build.yml b/ffmpeg-sys-the-third/.github/workflows/build.yml index 7dc321f..27bed4a 100644 --- a/ffmpeg-sys-the-third/.github/workflows/build.yml +++ b/ffmpeg-sys-the-third/.github/workflows/build.yml @@ -11,7 +11,8 @@ jobs: container: jrottenberg/ffmpeg:${{ matrix.ffmpeg_version }}-ubuntu strategy: matrix: - ffmpeg_version: ['3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1'] + ffmpeg_version: + ["3.3", "3.4", "4.0", "4.1", "4.2", "4.3", "4.4", "5.0", "5.1", "6.0"] fail-fast: false env: FEATURES: avcodec,avdevice,avfilter,avformat,postproc,swresample,swscale diff --git a/ffmpeg-sys-the-third/Cargo.toml b/ffmpeg-sys-the-third/Cargo.toml index b7ac02a..480aec8 100644 --- a/ffmpeg-sys-the-third/Cargo.toml +++ b/ffmpeg-sys-the-third/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ffmpeg-sys-the-third" -version = "1.0.2+ffmpeg-5.1.2" +version = "1.1.0+ffmpeg-6.0.0" build = "build.rs" links = "ffmpeg" diff --git a/ffmpeg-sys-the-third/build.rs b/ffmpeg-sys-the-third/build.rs index f5221e5..f32ea2f 100644 --- a/ffmpeg-sys-the-third/build.rs +++ b/ffmpeg-sys-the-third/build.rs @@ -441,7 +441,7 @@ fn check_features( ); } - let version_check_info = [("avcodec", 56, 60, 0, 108)]; + let version_check_info = [("avcodec", 56, 61, 0, 108)]; for &(lib, begin_version_major, end_version_major, begin_version_minor, end_version_minor) in version_check_info.iter() { diff --git a/ffmpeg-sys-the-third/channel_layout_fixed.h b/ffmpeg-sys-the-third/channel_layout_fixed.h index ca80edf..022a948 100644 --- a/ffmpeg-sys-the-third/channel_layout_fixed.h +++ b/ffmpeg-sys-the-third/channel_layout_fixed.h @@ -2,7 +2,8 @@ // https://github.com/rust-lang/rust-bindgen/issues/258 is fixed. #include -#if LIBAVUTIL_VERSION_MAJOR >= 57 && LIBAVUTIL_VERSION_MINOR >= 28 +#if (LIBAVUTIL_VERSION_MAJOR >= 57 && LIBAVUTIL_VERSION_MINOR >= 28) || \ + LIBAVUTIL_VERSION_MAJOR >= 58 #undef AV_CH_FRONT_LEFT #undef AV_CH_FRONT_RIGHT @@ -37,10 +38,8 @@ const unsigned long long AV_CH_FRONT_LEFT = (1ULL << AV_CHAN_FRONT_LEFT); const unsigned long long AV_CH_FRONT_RIGHT = (1ULL << AV_CHAN_FRONT_RIGHT); -const unsigned long long AV_CH_FRONT_CENTER = - (1ULL << AV_CHAN_FRONT_CENTER); -const unsigned long long AV_CH_LOW_FREQUENCY = - (1ULL << AV_CHAN_LOW_FREQUENCY); +const unsigned long long AV_CH_FRONT_CENTER = (1ULL << AV_CHAN_FRONT_CENTER); +const unsigned long long AV_CH_LOW_FREQUENCY = (1ULL << AV_CHAN_LOW_FREQUENCY); const unsigned long long AV_CH_BACK_LEFT = (1ULL << AV_CHAN_BACK_LEFT); const unsigned long long AV_CH_BACK_RIGHT = (1ULL << AV_CHAN_BACK_RIGHT); const unsigned long long AV_CH_FRONT_LEFT_OF_CENTER = @@ -57,15 +56,13 @@ const unsigned long long AV_CH_TOP_FRONT_CENTER = (1ULL << AV_CHAN_TOP_FRONT_CENTER); const unsigned long long AV_CH_TOP_FRONT_RIGHT = (1ULL << AV_CHAN_TOP_FRONT_RIGHT); -const unsigned long long AV_CH_TOP_BACK_LEFT = - (1ULL << AV_CHAN_TOP_BACK_LEFT); +const unsigned long long AV_CH_TOP_BACK_LEFT = (1ULL << AV_CHAN_TOP_BACK_LEFT); const unsigned long long AV_CH_TOP_BACK_CENTER = (1ULL << AV_CHAN_TOP_BACK_CENTER); const unsigned long long AV_CH_TOP_BACK_RIGHT = (1ULL << AV_CHAN_TOP_BACK_RIGHT); const unsigned long long AV_CH_STEREO_LEFT = (1ULL << AV_CHAN_STEREO_LEFT); -const unsigned long long AV_CH_STEREO_RIGHT = - (1ULL << AV_CHAN_STEREO_RIGHT); +const unsigned long long AV_CH_STEREO_RIGHT = (1ULL << AV_CHAN_STEREO_RIGHT); const unsigned long long AV_CH_WIDE_LEFT = (1ULL << AV_CHAN_WIDE_LEFT); const unsigned long long AV_CH_WIDE_RIGHT = (1ULL << AV_CHAN_WIDE_RIGHT); const unsigned long long AV_CH_SURROUND_DIRECT_LEFT = @@ -74,8 +71,7 @@ const unsigned long long AV_CH_SURROUND_DIRECT_RIGHT = (1ULL << AV_CHAN_SURROUND_DIRECT_RIGHT); const unsigned long long AV_CH_LOW_FREQUENCY_2 = (1ULL << AV_CHAN_LOW_FREQUENCY_2); -const unsigned long long AV_CH_TOP_SIDE_LEFT = - (1ULL << AV_CHAN_TOP_SIDE_LEFT); +const unsigned long long AV_CH_TOP_SIDE_LEFT = (1ULL << AV_CHAN_TOP_SIDE_LEFT); const unsigned long long AV_CH_TOP_SIDE_RIGHT = (1ULL << AV_CHAN_TOP_SIDE_RIGHT); const unsigned long long AV_CH_BOTTOM_FRONT_CENTER =