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)
* commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc':
  pthread: Fix deadlock during thread initialization

Conflicts:
libavcodec/pthread.c

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

Simple merge