]> git.sesse.net Git - ffmpeg/commit
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)
commit00bfe8509c9b947156689d5946969c4d1b4fc669
treeded711c251c5668842836006e0df49de0af2ffa1
parent8a3d3b624075c56b844cbd0f3d58c6e291c8e18c
parent193b09189004ede4a6998e69192d1a9f63602088
Merge commit '193b09189004ede4a6998e69192d1a9f63602088'

* commit '193b09189004ede4a6998e69192d1a9f63602088':
  thread: Define ff_mutex_* macros as stub functions when threads are disabled

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