Merge commit '46a17d886b8559723c40b9f5cdf0e0c6b1c95180' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Nov 2014 23:36:23 +0000 (00:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Nov 2014 23:36:23 +0000 (00:36 +0100)
commit15fd62110fd82f19f9e127cf8401756231112ce0
tree71caf8465eae6c442237c73ecc8f5bec3d44b177
parent86b532898d8a2dbd9ddd303434bd8a5a395b15a7
parent46a17d886b8559723c40b9f5cdf0e0c6b1c95180
Merge commit '46a17d886b8559723c40b9f5cdf0e0c6b1c95180' into release/2.4

* commit '46a17d886b8559723c40b9f5cdf0e0c6b1c95180':
  lavu: add wrappers for the pthreads mutex API

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/thread.h