Merge commit 'e3d4784eb31b3ea4a97f2d4c698a75fab9bf3d86'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Sep 2015 09:31:40 +0000 (11:31 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Sep 2015 09:31:40 +0000 (11:31 +0200)
commit7c46f24bde12d13e3214852b87f8bb2a8bbf0ac8
treecdf4e57e02057612d74f2285715f084b2e453e8f
parent695ff5dc6d9ed88a61a544146a6358ecc5259e6c
parente3d4784eb31b3ea4a97f2d4c698a75fab9bf3d86
Merge commit 'e3d4784eb31b3ea4a97f2d4c698a75fab9bf3d86'

* commit 'e3d4784eb31b3ea4a97f2d4c698a75fab9bf3d86':
  d3d11va: WindowsPhone requires a mutex around ID3D11VideoContext

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
doc/APIchanges
libavcodec/Makefile
libavcodec/d3d11va.h
libavcodec/dxva2.c
libavcodec/version.h