Changeset bc98788d in ffmpeg

Timestamp:
Nov 1, 2017, 5:13:04 PM (7 years ago)
Author:
James Almer <jamrial@gmail.com>
Branches:
master
Children:
4600b061
Parents:
a33a1575 (diff), 5edded9d (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.
Message:

Merge commit '5edded9df31bc4712a023f89941b4c278f1bd6f5'

See c1947015b2eec65c7fbd702e1d8c22248be511e8

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

(No files)

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