[FFmpeg-cvslog] Merge commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 15 12:31:29 2014 +0200| [6afd726b7b279cac09d8a8eb6d5529ac2425a996] | committer: Michael Niedermayer

Merge commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc'

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

Conflicts:
	compat/w32pthreads.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6afd726b7b279cac09d8a8eb6d5529ac2425a996
---