diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-13 18:25:30 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-04-13 18:25:30 -0300 |
| commit | 657c0720361499e573688384d4f6f625ef897bf8 (patch) | |
| tree | 0a9730c566d9cb8061718806c9dd5363d4f6ab32 /libavutil/Makefile | |
| parent | f416a8d66ac3fe4664b303bfa7c5617571cab1da (diff) | |
| parent | 2170017a1cd033b6f28e16476921022712a522d8 (diff) | |
| download | ffmpeg-657c0720361499e573688384d4f6f625ef897bf8.tar.gz | |
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>
Diffstat (limited to 'libavutil/Makefile')
| -rw-r--r-- | libavutil/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 |