[vlc-commits] Avcodec: avoid miscompilation with older libavutil version

Jean-Baptiste Kempf git at videolan.org
Wed Oct 3 16:04:03 CEST 2012


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Oct  3 16:03:20 2012 +0200| [65410039db4705562a1d69494eb43f34eb4740d5] | committer: Jean-Baptiste Kempf

Avcodec: avoid miscompilation with older libavutil version

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

 modules/codec/avcodec/cpu.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/codec/avcodec/cpu.c b/modules/codec/avcodec/cpu.c
index 91dd898..597d367 100644
--- a/modules/codec/avcodec/cpu.c
+++ b/modules/codec/avcodec/cpu.c
@@ -83,9 +83,11 @@ unsigned GetVlcDspMask( void )
 #endif
 
 #if defined ( __arm__)
+#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(29<<8)+0)
     if( !vlc_CPU_ARM_NEON() )
         mask |= AV_CPU_FLAG_NEON;
 #endif
+#endif
 
     return mask;
 }



More information about the vlc-commits mailing list