From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 23 Oct 2013 07:26:57 +0000 (+0200)
Subject: Merge commit '3511d4fc9784d5fbb024dce68ca7a0d7fdd74663'
X-Git-Tag: n2.1~144
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/d0f0ac426bdf95bc0cd152d8f2fc824cb7ddb7c5

Merge commit '3511d4fc9784d5fbb024dce68ca7a0d7fdd74663'

* commit '3511d4fc9784d5fbb024dce68ca7a0d7fdd74663':
  pthread: Avoid crashes/odd behavior caused by spurious wakeups

See: 692b93090443519c407834fc61e78b23a9019ac2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

d0f0ac426bdf95bc0cd152d8f2fc824cb7ddb7c5