Changeset 8c895ae7 in ffmpeg

Timestamp:
May 31, 2014, 10:53:46 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
9c22e909
Parents:
4ba85600 (diff), f797b134 (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> (05/31/14 10:37:01)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/31/14 10:53:46)
Message:

Merge commit 'f797b134cad4d248b1c8955659997980d0668bc3'

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

(No files)

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