Merge commit '173b56218f39c6463be0e182259e2deead106936'

Browse Source

* 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
69218b4198
add7b3bc3f
5d76674756

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

...

This commit is contained in:

James Almer 2017-11-11 10:14:11 -03:00

parent 672e704e4a 173b56218f

commit 9194d3d380

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available