Merge commit '874c751cc5b99cd68932e21c2c3a0d21134207e0'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 20:53:42 +0000 (21:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 20:53:58 +0000 (21:53 +0100)
* commit '874c751cc5b99cd68932e21c2c3a0d21134207e0':
  threads: Check w32threads dependencies at the configure stage

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavutil/atomic.c

diff --cc configure
Simple merge
Simple merge