From: James Almer Date: Thu, 26 Oct 2017 20:13:14 +0000 (-0300) Subject: Merge commit '193b09189004ede4a6998e69192d1a9f63602088' X-Git-Tag: n4.0~2080 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=00bfe8509c9b947156689d5946969c4d1b4fc669 Merge commit '193b09189004ede4a6998e69192d1a9f63602088' * commit '193b09189004ede4a6998e69192d1a9f63602088': thread: Define ff_mutex_* macros as stub functions when threads are disabled Merged-by: James Almer --- 00bfe8509c9b947156689d5946969c4d1b4fc669