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