[FFmpeg-cvslog] Merge commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 14 00:04:52 2013 +0200| [005200887b2c9df2e489bd6419697a6841dba396] | committer: Michael Niedermayer

Merge commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc'

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

Conflicts:
	libavcodec/pthread.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=005200887b2c9df2e489bd6419697a6841dba396
---