Changeset 571a99de in ffmpeg

Timestamp:
Nov 16, 2013, 10:42:18 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
0ee905e2
Parents:
ec9aef56 (diff), 2ff302cb (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> (11/16/13 22:42:08)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/16/13 22:42:18)
Message:

Merge commit '2ff302cb6ba1f159905888026c8a1d7dd8319acf'

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

(No files)

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