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)
* commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834':
  win32: Do not use GetProcAddress when compiled for Vista+

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

Simple merge