Merge commit '1a5a6ac01b0ad2cf3d2128372ea41f3c1cfc2d3f' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Dec 2013 01:14:24 +0000 (02:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Dec 2013 01:14:24 +0000 (02:14 +0100)
commitb589b8a7042fa0ba296e0f080c30d853da56b925
tree40172a2f2297c81fbdc7f9fb6ae741519474a620
parent5bd291e265b988c285f96076b6d9f05de940439b
parent1a5a6ac01b0ad2cf3d2128372ea41f3c1cfc2d3f
Merge commit '1a5a6ac01b0ad2cf3d2128372ea41f3c1cfc2d3f' into release/1.1

* commit '1a5a6ac01b0ad2cf3d2128372ea41f3c1cfc2d3f':
  pthread: Fix deadlock during thread initialization

Conflicts:
libavcodec/pthread.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>