Changeset cd016db4 in ffmpeg

Timestamp:
Jun 6, 2014, 9:34:44 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
faabef3d
Parents:
00acf5c4 (diff), f558f0d2 (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> (06/06/14 21:29:17)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/06/14 21:34:44)
Message:

Merge commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362'

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

(No files)

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