Merge commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 May 2013 08:52:12 +0000 (10:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 May 2013 08:52:19 +0000 (10:52 +0200)
commitfaac955d9b7abf1c17dd76df6a8f2f3644ef5099
treec679a975dc80a3c2102316c2e55ce7d771cfdf02
parent2afcd16711e029185288375f0bf9946d406bb0db
parentc360fb174b01170ab3fd3048d4d0acb44aa4e834
Merge commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834'

* commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834':
  win32: Do not use GetProcAddress when compiled for Vista+

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/w32pthreads.h