ffmpeg | branch: master | James Almer <[email protected]> | Thu Apr 13 18:25:30 2017 -0300| [657c0720361499e573688384d4f6f625ef897bf8] | committer: James Almer
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 <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=657c0720361499e573688384d4f6f625ef897bf8 --- libavutil/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/Makefile b/libavutil/Makefile index 15d95dec67..d669a924b0 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -226,8 +226,8 @@ TESTPROGS = adler32 \ xtea \ tea \ +TESTPROGS-$(HAVE_THREADS) += cpu_init TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo -TESTPROGS-$(HAVE_THREADS) += cpu_init TOOLS = crypto_bench ffhash ffeval ffescape ====================================================================== diff --cc libavutil/Makefile index 15d95dec67,f34c79950e..d669a924b0 --- a/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 \ + tea \ + ++TESTPROGS-$(HAVE_THREADS) += cpu_init +TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo - TESTPROGS-$(HAVE_THREADS) += cpu_init + +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 _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
