Commit 084c96f1 authored by Rafaël Carré's avatar Rafaël Carré

FFmpeg doesn't use the same version numbers than Libav

Found-by: Timo Rothenpieler
parent 959c5185
...@@ -310,7 +310,7 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -310,7 +310,7 @@ static int OpenDecoder( vlc_object_t *p_this )
p_context->opaque = (void *)p_this; p_context->opaque = (void *)p_this;
/* set CPU capabilities */ /* 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() ); av_set_cpu_flags_mask( INT_MAX & ~GetVlcDspMask() );
#else #else
p_context->dsp_mask = GetVlcDspMask(); p_context->dsp_mask = GetVlcDspMask();
......
...@@ -39,7 +39,7 @@ static inline void vlc_init_avformat(void) ...@@ -39,7 +39,7 @@ static inline void vlc_init_avformat(void)
{ {
vlc_avcodec_lock(); 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() ); av_set_cpu_flags_mask( INT_MAX & ~GetVlcDspMask() );
#endif #endif
......
...@@ -311,7 +311,7 @@ int OpenEncoder( vlc_object_t *p_this ) ...@@ -311,7 +311,7 @@ int OpenEncoder( vlc_object_t *p_this )
p_context->opaque = (void *)p_this; p_context->opaque = (void *)p_this;
/* set CPU capabilities */ /* 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() ); av_set_cpu_flags_mask( INT_MAX & ~GetVlcDspMask() );
#else #else
p_context->dsp_mask = GetVlcDspMask(); p_context->dsp_mask = GetVlcDspMask();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment