Merge commit '2170017a1cd033b6f28e16476921022712a522d8'

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

This commit is a noop, see fed50c4304eecb352e29ce789cdb96ea84d6162f

Merged-by: James Almer <jamrial@gmail.com>

diff --cc libavutil/Makefile
index 15d95de,f34c799..d669a92
--- 1/libavutil/Makefile
--- 2/libavutil/Makefile
+++ b/libavutil/Makefile
@@@ -194,44 -133,17 +194,44 @@@ TESTPROGS = adler3
              cpu                                                         \
              crc                                                         \
              des                                                         \
 +            dict                                                        \
 +            display                                                     \
 +            error                                                       \
              eval                                                        \
 +            file                                                        \
              fifo                                                        \
              float_dsp                                                   \
 +            hash                                                        \
              hmac                                                        \
 +            imgutils                                                    \
              lfg                                                         \
              lls                                                         \
 +            log                                                         \
              md5                                                         \
 +            murmur3                                                     \
              opt                                                         \
 +            pca                                                         \
              parseutils                                                  \
 +            pixdesc                                                     \
 +            pixelutils                                                  \
 +            random_seed                                                 \
 +            rational                                                    \
 +            ripemd                                                      \
              sha                                                         \
 +            sha512                                                      \
 +            softfloat                                                   \
              tree                                                        \
 +            twofish                                                     \
 +            utf8                                                        \
              xtea                                                        \
- TESTPROGS-$(HAVE_THREADS) += cpu_init
 +            tea                                                         \
 +
++TESTPROGS-$(HAVE_THREADS)            += cpu_init
 +TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
 +
 +TOOLS = crypto_bench ffhash ffeval ffescape
 +
 +tools/crypto_bench$(EXESUF): ELIBS += $(if $(VERSUS),$(subst +, -l,+$(VERSUS)),)
 +tools/crypto_bench$(EXESUF): CFLAGS += -DUSE_EXT_LIBS=0$(if $(VERSUS),$(subst +,+USE_,+$(VERSUS)),)
  
 -TESTPROGS-$(HAVE_THREADS)               += cpu_init
 +$(SUBDIR)tests/lzo$(EXESUF): ELIBS = -llzo2