Merge commit '2170017a'

* commit '2170017a':
  avutil: fix data race in av_get_cpu_flags()

This commit is a noop, see fed50c43Merged-by: James Almer <jamrial@gmail.com>

libavutil/Makefile

@@ -226,8 +226,8 @@ TESTPROGS = adler32                                                     \
             xtea                                                        \
             tea                                                         \
 
-TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
 TESTPROGS-$(HAVE_THREADS)            += cpu_init
+TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
 
 TOOLS = crypto_bench ffhash ffeval ffescape