Changeset faafffaf in ffmpeg

Timestamp:
Oct 8, 2013, 8:52:51 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
006c0fcf
Parents:
3d5a995e (diff), ad76e6e (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> (10/08/13 08:52:47)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/08/13 08:52:51)
Message:

Merge commit 'ad76e6e7e193b98e7335156422d35467816f9ef1'

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

(No files)

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