Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Jan 2014 22:32:09 +0000 (23:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Jan 2014 22:32:09 +0000 (23:32 +0100)
commit86a423d2b8c62ca11070b4d67df9cb838e887fa4
tree8477df1992c2a559e52efddfb4549c6fa397d771
parenta26bfc444d256585a9c084cc89ac0f983241755a
parent3736b13753921fd576080ea4e328ff80bb0abf9b
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

* qatar/release/0.8:
  Changelog for 0.8.10
  pthread: Avoid spurious wakeups

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavcodec/pthread.c