Changeset 60ed9b70 in ffmpeg

Timestamp:
Nov 1, 2017, 8:37:48 PM (7 years ago)
Author:
James Almer <jamrial@gmail.com>
Branches:
master
Children:
8e8d4cf8
Parents:
cf170869 (diff), a876958d (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 'a876958d0fdd8bf10d315175daff12cd7d768053'

This commit is a noop, see e2b7ae4b198c1dc001b3b28476608eaf4daf726c

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

(No files)

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