Changeset 3a8b52c0 in ffmpeg

Timestamp:
Oct 16, 2013, 9:12:23 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
8895b71d
Parents:
12e98210 (diff), 3b4fa548 (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> (10/16/13 09:05:02)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/16/13 09:12:23)
Message:

Merge commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8'

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

(No files)

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