Changeset 4600b061 in ffmpeg

Timestamp:
Nov 1, 2017, 7:52:05 PM (7 years ago)
Author:
James Almer <jamrial@gmail.com>
Branches:
master
Children:
cf170869
Parents:
bc98788d (diff), 61cec5ad (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
James Almer <jamrial@gmail.com> (11/01/17 19:26:36)
git-committer:
James Almer <jamrial@gmail.com> (11/01/17 19:52:05)
Message:

Merge commit '61cec5adaacb358783c18aa07362f15824c1b274'

Also includes ed434be106a4615e0419b3ac7664220741afda2d
Changes were made to support schannel and securetransport.

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.