[FFmpeg-cvslog] Merge commit 'e10e6651b50b4087f08813f3e503620db7413d3a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 14 22:05:13 2014 +0100| [add040ff01cd325dde30e43bda5d603c99f27e8a] | committer: Michael Niedermayer

Merge commit 'e10e6651b50b4087f08813f3e503620db7413d3a'

* commit 'e10e6651b50b4087f08813f3e503620db7413d3a':
  thread: use "" instead of <> for including the w32pthreads wrapper

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

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