Changeset 3e1483d0 in ffmpeg

Timestamp:
Oct 22, 2013, 5:15:19 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
4aeafbaa
Parents:
cf47a6a (diff), 19f53840 (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/22/13 17:09:33)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/22/13 17:15:19)
Message:

Merge commit '19f53840001a7afcdb57b2a797e363ec8081aba3'

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

(No files)

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