Changeset d19ca4b2 in ffmpeg

Timestamp:
Feb 20, 2015, 8:57:34 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
dc6eadaa
Parents:
ac7128a9 (diff), a335ed76 (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> (02/20/15 20:57:30)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/20/15 20:57:34)
Message:

Merge commit 'a335ed767161c6da2815371177cfd5e40f78e5b7'

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

(No files)

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