[FFmpeg-devel] [PATCH] qsv: fix the dangerous macro definitions
Zhong Li
zhong.li at intel.com
Wed Mar 27 12:24:16 EET 2019
Signed-off-by: Zhong Li <zhong.li at intel.com>
---
libavcodec/qsv_internal.h | 8 ++++----
libavfilter/qsvvpp.h | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
index 394c558883..86a5dbad98 100644
--- a/libavcodec/qsv_internal.h
+++ b/libavcodec/qsv_internal.h
@@ -35,12 +35,12 @@
#define QSV_MAX_ENC_PAYLOAD 2 // # of mfxEncodeCtrl payloads supported
#define QSV_VERSION_ATLEAST(MAJOR, MINOR) \
- (MFX_VERSION_MAJOR > (MAJOR) || \
- MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR))
+ ((MFX_VERSION_MAJOR > (MAJOR) || \
+ MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR)))
#define QSV_RUNTIME_VERSION_ATLEAST(MFX_VERSION, MAJOR, MINOR) \
- (MFX_VERSION.Major > (MAJOR)) || \
- (MFX_VERSION.Major == (MAJOR) && MFX_VERSION.Minor >= (MINOR))
+ ((MFX_VERSION.Major > (MAJOR)) || \
+ (MFX_VERSION.Major == (MAJOR) && MFX_VERSION.Minor >= (MINOR)))
typedef struct QSVMid {
AVBufferRef *hw_frames_ref;
diff --git a/libavfilter/qsvvpp.h b/libavfilter/qsvvpp.h
index ff02b64c41..a02de6321a 100644
--- a/libavfilter/qsvvpp.h
+++ b/libavfilter/qsvvpp.h
@@ -32,12 +32,12 @@
#define FF_OUTLINK_IDX(link) ((int)((link)->srcpad - (link)->src->output_pads))
#define QSV_VERSION_ATLEAST(MAJOR, MINOR) \
- (MFX_VERSION_MAJOR > (MAJOR) || \
- MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR))
+ ((MFX_VERSION_MAJOR > (MAJOR) || \
+ MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR)))
#define QSV_RUNTIME_VERSION_ATLEAST(MFX_VERSION, MAJOR, MINOR) \
- (MFX_VERSION.Major > (MAJOR)) || \
- (MFX_VERSION.Major == (MAJOR) && MFX_VERSION.Minor >= (MINOR))
+ ((MFX_VERSION.Major > (MAJOR)) || \
+ (MFX_VERSION.Major == (MAJOR) && MFX_VERSION.Minor >= (MINOR)))
typedef struct QSVVPPContext QSVVPPContext;
--
2.17.1
More information about the ffmpeg-devel
mailing list