Merge commit '193b09189004ede4a6998e69192d1a9f63602088'
authorJames Almer <jamrial@gmail.com>
Thu, 26 Oct 2017 20:13:14 +0000 (17:13 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 26 Oct 2017 20:13:14 +0000 (17:13 -0300)
* commit '193b09189004ede4a6998e69192d1a9f63602088':
  thread: Define ff_mutex_* macros as stub functions when threads are disabled

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavutil/thread.h

Simple merge