Merge commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 22:04:52 +0000 (00:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 22:04:52 +0000 (00:04 +0200)
commit005200887b2c9df2e489bd6419697a6841dba396
tree6beb6b36ee4273f29771cd99ea8cf3443dc7f687
parent5340c3dd8d2ae14dc1f1df880f3c0857f2ec8c00
parenteb90a2091ffb94d8c29aaa5ff50f4192520254fc
Merge commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc'

* commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc':
  pthread: Fix deadlock during thread initialization

Conflicts:
libavcodec/pthread.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/pthread.c