[vlc-commits] avcodec: Correct macro definition in LIBAVUTIL_VERSION_CHECK.

Zoran Turalija git at videolan.org
Mon Mar 25 22:03:17 CET 2013


vlc | branch: master | Zoran Turalija <zoran.turalija at gmail.com> | Mon Mar 25 21:01:39 2013 +0100| [84d91009ee0b9faf2c7926f098ad7a00b96ede42] | committer: Rémi Denis-Courmont

avcodec: Correct macro definition in LIBAVUTIL_VERSION_CHECK.

Use parenthesis around the expression returned in LIBAVUTIL_VERSION_CHECK,
to avoid problems that can arise in future with some ways macro may be used.

Same as what has been done in LIBAVCODEC_VERSION_CHECK.

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=84d91009ee0b9faf2c7926f098ad7a00b96ede42
---

 modules/codec/avcodec/avcommon.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/avcodec/avcommon.h b/modules/codec/avcodec/avcommon.h
index 3c15f94..90df890 100644
--- a/modules/codec/avcodec/avcommon.h
+++ b/modules/codec/avcodec/avcommon.h
@@ -41,8 +41,8 @@
  * b and c the minor and micro versions of libav
  * d and e the minor and micro versions of FFmpeg */
 #define LIBAVUTIL_VERSION_CHECK( a, b, c, d, e ) \
-    (LIBAVUTIL_VERSION_MICRO <  100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \
-    (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, d, e ) )
+    ( (LIBAVUTIL_VERSION_MICRO <  100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \
+      (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) )
 
 
 unsigned GetVlcDspMask( void );



More information about the vlc-commits mailing list