[vlc-commits] FFmpeg doesn't use the same version numbers than Libav

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Jan 25 06:38:53 2013 +0100| [084c96f1d376c9cca19a6c04b1b5db5d44a4c4f0] | committer: Rafaël Carré

FFmpeg doesn't use the same version numbers than Libav

Found-by: Timo Rothenpieler

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

 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 83680a2..4fb8b26 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, 25, 0 )
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 51, 42, 0 )
     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 a614174..5aefbbf 100644
--- a/modules/codec/avcodec/avcommon.h
+++ b/modules/codec/avcodec/avcommon.h
@@ -39,7 +39,7 @@ static inline void vlc_init_avformat(void)
 {
     vlc_avcodec_lock();
 
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 51, 25, 0 )
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 51, 42, 0 )
     av_set_cpu_flags_mask( INT_MAX & ~GetVlcDspMask() );
 #endif
 
diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index a19a09c..cbb8789 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, 25, 0 )
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 51, 42, 0 )
     av_set_cpu_flags_mask( INT_MAX & ~GetVlcDspMask() );
 #else
     p_context->dsp_mask = GetVlcDspMask();