Changeset 8b30702c in ffmpeg

Timestamp:
Apr 29, 2014, 10:23:01 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
3050e53f, b3d48c3
Parents:
ed72dae4 (diff), 6a13505c (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> (04/29/14 22:22:53)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/29/14 22:23:01)
Message:

Merge commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1'

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

(No files)

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