Avcodec: avoid miscompilation with older libavutil version

65410039 · Jean-Baptiste Kempf · 313e047e · 65410039
Commit 65410039 authored Oct 03, 2012 by Jean-Baptiste Kempf
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

modules/codec/avcodec/cpu.c modules/codec/avcodec/cpu.c +2 -0

No files found.
--- a/modules/codec/avcodec/cpu.c
+++ b/modules/codec/avcodec/cpu.c
@@ -83,8 +83,10 @@ 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;