projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 60ea0a5 3511d4f)
Merge commit '3511d4fc9784d5fbb024dce68ca7a0d7fdd74663'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 07:26:57 +0000 (09:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 07:28:24 +0000 (09:28 +0200)
* commit '3511d4fc9784d5fbb024dce68ca7a0d7fdd74663':
  pthread: Avoid crashes/odd behavior caused by spurious wakeups

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

Trivial merge
FFmpeg git repo