Changeset 6c52432b in ffmpeg

Timestamp:
Aug 10, 2015, 9:20:09 AM (9 years ago)
Author:
Hendrik Leppkes <h.leppkes@gmail.com>
Branches:
master
Children:
7653ebff
Parents:
e1def4ff (diff), 8e34089 (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 '8e34089e265a6b01e1e3301e8864439d26793753'

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

(No files)

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