Changeset 5ab46704 in ffmpeg

Timestamp:
Dec 8, 2014, 11:15:44 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
8554a109
Parents:
3f24dacf (diff), 29bc7bfb (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> (12/08/14 11:14:47)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/08/14 11:15:44)
Message:

Merge commit '29bc7bfba288ff8572ed967a8752a1dbde7b724b'

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

(No files)

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