Changeset 374f818b in ffmpeg

Timestamp:
Dec 14, 2017, 10:05:55 PM (7 years ago)
Author:
James Almer <jamrial@gmail.com>
Branches:
master
Children:
980af9a8
Parents:
b4718b76 (diff), 50837855 (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> (12/14/17 22:04:37)
git-committer:
James Almer <jamrial@gmail.com> (12/14/17 22:05:55)
Message:

Merge commit '508378556631dc18d32247b4a4e35703758e1ca9'

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

(No files)

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