[vlc-commits] Use precise version check for FFmpeg/libav

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Jan 25 07:10:37 2013 +0100| [82845085b906b496cad432682c68bc039456eb4c] | committer: Rafaël Carré

Use precise version check for FFmpeg/libav

Pointed-out-by: thresh

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

 modules/codec/avcodec/avcodec.c  |    2 +-
 modules/codec/avcodec/avcommon.h |    2 +-
 modules/codec/avcodec/encoder.c  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index 4fb8b26..f75c776 100644
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -310,7 +310,7 @@ static int OpenDecoder( vlc_object_t *p_this )
     p_context->opaque = (void *)p_this;
 
     /* set CPU capabilities */
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 51, 42, 0 )
+#if LIBAVUTIL_VERSION_CHECK(51, 25, 0, 42, 100)
     av_set_cpu_flags_mask( INT_MAX & ~GetVlcDspMask() );
 #else
     p_context->dsp_mask = GetVlcDspMask();
diff --git a/modules/codec/avcodec/avcommon.h b/modules/codec/avcodec/avcommon.h
index 5f47680..057d772 100644
--- a/modules/codec/avcodec/avcommon.h
+++ b/modules/codec/avcodec/avcommon.h
@@ -48,7 +48,7 @@ static inline void vlc_init_avformat(void)
 {
     vlc_avcodec_lock();
 
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 51, 42, 0 )
+#if LIBAVUTIL_VERSION_CHECK(51, 25, 0, 42, 100)
     av_set_cpu_flags_mask( INT_MAX & ~GetVlcDspMask() );
 #endif
 
diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index cbb8789..2047b3b 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -311,7 +311,7 @@ int OpenEncoder( vlc_object_t *p_this )
     p_context->opaque = (void *)p_this;
 
     /* set CPU capabilities */
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 51, 42, 0 )
+#if LIBAVUTIL_VERSION_CHECK(51, 25, 0, 42, 100)
     av_set_cpu_flags_mask( INT_MAX & ~GetVlcDspMask() );
 #else
     p_context->dsp_mask = GetVlcDspMask();