Changeset 15e933b7 in ffmpeg

Timestamp:
Jul 11, 2014, 6:36:31 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
2cebd17e
Parents:
b8cdf047 (diff), 6cc1409b (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:
Michael Niedermayer <michaelni@gmx.at> (07/11/14 18:35:26)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (07/11/14 18:36:31)
Message:

Merge commit '6cc1409ba8650fb7eaedc96e970664febc02a5e9'

See: 9b211c43dc5f2e618f204c4a7fd184eb2ea51f02
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)

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