Changeset 175aeab0 in ffmpeg

Timestamp:
May 28, 2014, 12:53:55 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
cf3a038f
Parents:
2320731 (diff), b5aa4855 (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> (05/28/14 12:53:31)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/28/14 12:53:55)
Message:

Merge commit 'b5aa48551300eed678aaea86ced7086758598a35'

Merged-by: Michael Niedermayer <michaelni@gmx.at>

(No files)

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