Merge commit '30e256430eb88c6d4c382581b89bca171d79fbc0'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 09:49:00 +0000 (11:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 09:49:00 +0000 (11:49 +0200)
commit36d349034e19e111cc43de7a0e5749f8235b3bf9
tree1806d2f1e7c53f6f0334666d0b48b4b21181095b
parent1e9a050bc020825094684ba27fc28025bf0a8088
parent30e256430eb88c6d4c382581b89bca171d79fbc0
Merge commit '30e256430eb88c6d4c382581b89bca171d79fbc0'

* commit '30e256430eb88c6d4c382581b89bca171d79fbc0':
  lavc/pthread: remove obsolete checks

Conflicts:
libavcodec/utils.c

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