Changeset 1ffbaa88 in ffmpeg

Timestamp:
Mar 30, 2014, 11:58:14 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
46ff8108
Parents:
20bc5924 (diff), fce28c3c (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> (03/30/14 23:55:58)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/30/14 23:58:14)
Message:

Merge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8'

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

(No files)

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