Changeset 5de251a3 in ffmpeg

Timestamp:
Oct 5, 2013, 9:14:26 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
47a57c68
Parents:
a7630e37 (diff), d347a7b2 (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/05/13 09:13:38)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/05/13 09:14:26)
Message:

Merge commit 'd347a7b248d4ffdc278373fecf033b0ade030343'

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

(No files)

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