* commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc': pthread: Fix deadlock during thread initialization Conflicts: libavcodec/pthread.c Merged-by: Michael Niedermayer <michaelni@gmx.at>