mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-27 09:11:17 +00:00
Merge commit '2170017a1cd033b6f28e16476921022712a522d8'
* commit '2170017a1cd033b6f28e16476921022712a522d8':
avutil: fix data race in av_get_cpu_flags()
This commit is a noop, see fed50c4304
Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
657c072036
@ -226,8 +226,8 @@ TESTPROGS = adler32 \
|
|||||||
xtea \
|
xtea \
|
||||||
tea \
|
tea \
|
||||||
|
|
||||||
|
TESTPROGS-$(HAVE_THREADS) += cpu_init
|
||||||
TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
|
TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
|
||||||
TESTPROGS-$(HAVE_THREADS) += cpu_init
|
|
||||||
|
|
||||||
TOOLS = crypto_bench ffhash ffeval ffescape
|
TOOLS = crypto_bench ffhash ffeval ffescape
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user