Commit 9194d3d3 authored by James Almer's avatar James Almer

Merge commit '173b5621'

* commit '173b5621':
  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
69218b41
add7b3bc
5d766747Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents 672e704e 173b5621
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment