Merge commit '173b56218f39c6463be0e182259e2deead106936'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 13:14:11 +0000 (10:14 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 13:14:11 +0000 (10:14 -0300)
* commit '173b56218f39c6463be0e182259e2deead106936':
  lavf: make avio_read_partial() public
  swscale: Do not expand a macro with 'defined' in it
  configure: Include d3d11va_extralibs in libavutil

This commit is a noop, see
69218b41980883a7e75656f3058171939f5729ef
add7b3bc3fb7685cd0a3ccffd2b09cc0e32c39ec
5d76674756806e3b458e484788775fcee34aac2a

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge