[FFmpeg-devel,v2] qsv: fix the dangerous macro definitions

Submitted by Zhong Li on March 28, 2019, 9:16 a.m.

Details

Message ID 20190328091625.4046-1-zhong.li@intel.com
State New
Headers show

Commit Message

Zhong Li March 28, 2019, 9:16 a.m.
Signed-off-by: Zhong Li <zhong.li@intel.com>
---
 libavcodec/qsv_internal.h | 6 +++---
 libavfilter/qsvvpp.h      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

Comments

Carl Eugen Hoyos March 28, 2019, 12:02 p.m.
2019-03-28 10:16 GMT+01:00, Zhong Li <zhong.li@intel.com>:
> Signed-off-by: Zhong Li <zhong.li@intel.com>
> ---
>  libavcodec/qsv_internal.h | 6 +++---
>  libavfilter/qsvvpp.h      | 6 +++---
>  2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
> index 394c558883..f9bfc07c36 100644
> --- a/libavcodec/qsv_internal.h
> +++ b/libavcodec/qsv_internal.h
> @@ -36,11 +36,11 @@
>
>  #define QSV_VERSION_ATLEAST(MAJOR, MINOR)   \
>      (MFX_VERSION_MAJOR > (MAJOR) ||         \
> -     MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR))
> +    (MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR)))

Why is this needed?

Carl Eugen
Zhong Li March 28, 2019, 12:08 p.m.
> From: ffmpeg-devel [mailto:ffmpeg-devel-bounces@ffmpeg.org] On Behalf

> Of Carl Eugen Hoyos

> Sent: Thursday, March 28, 2019 8:03 PM

> To: FFmpeg development discussions and patches

> <ffmpeg-devel@ffmpeg.org>

> Subject: Re: [FFmpeg-devel] [PATCH v2] qsv: fix the dangerous macro

> definitions

> 

> 2019-03-28 10:16 GMT+01:00, Zhong Li <zhong.li@intel.com>:

> > Signed-off-by: Zhong Li <zhong.li@intel.com>

> > ---

> >  libavcodec/qsv_internal.h | 6 +++---

> >  libavfilter/qsvvpp.h      | 6 +++---

> >  2 files changed, 6 insertions(+), 6 deletions(-)

> >

> > diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h

> > index 394c558883..f9bfc07c36 100644

> > --- a/libavcodec/qsv_internal.h

> > +++ b/libavcodec/qsv_internal.h

> > @@ -36,11 +36,11 @@

> >

> >  #define QSV_VERSION_ATLEAST(MAJOR, MINOR)   \

> >      (MFX_VERSION_MAJOR > (MAJOR) ||         \

> > -     MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >=

> (MINOR))

> > +    (MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >=

> (MINOR)))

> 

> Why is this needed?


See my comment in http://ffmpeg.org/pipermail/ffmpeg-devel/2019-March/241792.html

Patch hide | download patch | download mbox

diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
index 394c558883..f9bfc07c36 100644
--- a/libavcodec/qsv_internal.h
+++ b/libavcodec/qsv_internal.h
@@ -36,11 +36,11 @@ 
 
 #define QSV_VERSION_ATLEAST(MAJOR, MINOR)   \
     (MFX_VERSION_MAJOR > (MAJOR) ||         \
-     MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR))
+    (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..d923bfde5d 100644
--- a/libavfilter/qsvvpp.h
+++ b/libavfilter/qsvvpp.h
@@ -33,11 +33,11 @@ 
 
 #define QSV_VERSION_ATLEAST(MAJOR, MINOR)   \
     (MFX_VERSION_MAJOR > (MAJOR) ||         \
-     MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR))
+    (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;