Changeset a33a1575 in ffmpeg

Timestamp:
Nov 1, 2017, 5:07:48 PM (7 years ago)
Author:
James Almer <jamrial@gmail.com>
Branches:
master
Children:
bc98788d
Parents:
b5e2974b (diff), b98f082d (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 'b98f082d8ddc0a0d8317114d8414ab51de60ef02'

See 4a9af07a49295e014b059c1ab624c40345af5892

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

(No files)

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