Merge commit '2170017a1cd033b6f28e16476921022712a522d8'
authorJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 21:25:30 +0000 (18:25 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 21:25:30 +0000 (18:25 -0300)
commit657c0720361499e573688384d4f6f625ef897bf8
tree0a9730c566d9cb8061718806c9dd5363d4f6ab32
parentf416a8d66ac3fe4664b303bfa7c5617571cab1da
parent2170017a1cd033b6f28e16476921022712a522d8
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>
libavutil/Makefile