Changeset aa56c37c in ffmpeg

Timestamp:
Jul 11, 2014, 10:16:24 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
e1f4397e
Parents:
673a2b38 (diff), f43789b7 (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 10:05:47)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (07/11/14 10:16:24)
Message:

Merge commit 'f43789b76e661acd93c21664678f140e53cfa1fa'

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

(No files)

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