Merge commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 10:31:29 +0000 (12:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 10:31:29 +0000 (12:31 +0200)
commit6afd726b7b279cac09d8a8eb6d5529ac2425a996
tree3b1e248205c43e93cb63878bd8008f5feda43392
parent1e81b185ae722b5ba93a8615615241a07b3b28ee
parent6baeadd11083774ebd823dd5e1a744c2150a3bfc
Merge commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc'

* commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc':
  w32pthreads: Mark functions in compatibility wrapper as av_unused

Conflicts:
compat/w32pthreads.h

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