From 00fa8d39d56e423b2fe6f63502c7ca5fd484b0b9 Mon Sep 17 00:00:00 2001 From: tilpner Date: Thu, 20 Apr 2023 23:32:47 +0200 Subject: [PATCH] fix(util/frame/side_data): feature-gate QpTable side data types --- src/util/frame/side_data.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/util/frame/side_data.rs b/src/util/frame/side_data.rs index 6983d31..f945ab7 100644 --- a/src/util/frame/side_data.rs +++ b/src/util/frame/side_data.rs @@ -29,9 +29,10 @@ pub enum Type { #[cfg(feature = "ffmpeg_3_4")] IccProfile, - #[cfg(feature = "ffmpeg_4_0")] + #[cfg(all(feature = "ffmpeg_4_0", not(feature = "ffmpeg_5_0")))] QpTableProperties, - #[cfg(feature = "ffmpeg_4_0")] + + #[cfg(all(feature = "ffmpeg_4_0", not(feature = "ffmpeg_5_0")))] QpTableData, #[cfg(feature = "ffmpeg_4_1")] @@ -71,9 +72,9 @@ impl From for Type { #[cfg(feature = "ffmpeg_3_4")] AV_FRAME_DATA_ICC_PROFILE => Type::IccProfile, // TODO It's undef #if in frame.h - #[cfg(feature = "ffmpeg_4_0")] + #[cfg(all(feature = "ffmpeg_4_0", not(feature = "ffmpeg_5_0")))] AV_FRAME_DATA_QP_TABLE_PROPERTIES => Type::QpTableProperties, - #[cfg(feature = "ffmpeg_4_0")] + #[cfg(all(feature = "ffmpeg_4_0", not(feature = "ffmpeg_5_0")))] AV_FRAME_DATA_QP_TABLE_DATA => Type::QpTableData, #[cfg(feature = "ffmpeg_4_1")] AV_FRAME_DATA_S12M_TIMECODE => Type::S12MTimecode, @@ -108,9 +109,9 @@ impl Into for Type { #[cfg(feature = "ffmpeg_3_4")] Type::IccProfile => AV_FRAME_DATA_ICC_PROFILE, - #[cfg(feature = "ffmpeg_4_0")] + #[cfg(all(feature = "ffmpeg_4_0", not(feature = "ffmpeg_5_0")))] Type::QpTableProperties => AV_FRAME_DATA_QP_TABLE_PROPERTIES, - #[cfg(feature = "ffmpeg_4_0")] + #[cfg(all(feature = "ffmpeg_4_0", not(feature = "ffmpeg_5_0")))] Type::QpTableData => AV_FRAME_DATA_QP_TABLE_DATA, #[cfg(feature = "ffmpeg_4_1")]