Changeset 4a89868c in ffmpeg

Timestamp:
Sep 25, 2013, 8:25:17 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
9b3d4258
Parents:
b0b66269 (diff), cab8c5f8 (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> (09/25/13 08:21:04)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (09/25/13 08:25:17)
Message:

Merge commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5'

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

(No files)

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