Changeset ccb6b05 in ffmpeg

Timestamp:
Sep 29, 2013, 10:13:36 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
143a19f5
Parents:
a6b79bb (diff), 640a2427 (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/29/13 22:13:03)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (09/29/13 22:13:36)
Message:

Merge commit '640a2427aafa774b83316b7a8c5c2bdc28bfd269'

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

(No files)

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