Merge commit '5ff3b5cafcc685b6936d16602b0f80aa09a95870'
authorJames Almer <jamrial@gmail.com>
Wed, 11 Oct 2017 22:05:58 +0000 (19:05 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 11 Oct 2017 22:05:58 +0000 (19:05 -0300)
commit7d2882bf52a66f52f1d978782b378427a32221bd
tree0ccfd30aeeea15495b57e6b4deec2ac20a31cdcf
parent85e2fe6281834ac7f16a12a332d9de4b2ec3cd29
parent5ff3b5cafcc685b6936d16602b0f80aa09a95870
Merge commit '5ff3b5cafcc685b6936d16602b0f80aa09a95870'

* commit '5ff3b5cafcc685b6936d16602b0f80aa09a95870':
  build: Add pthreads to list of avutil extralibs

This commit is a noop, see 6dfcbd80ad446ff163b47f2bf432bbf706436ea8

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