Changeset 233dbee3 in ffmpeg

Timestamp:
Apr 9, 2014, 2:06:35 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
e40d92b1
Parents:
ed962414 (diff), b6a09ef7 (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/09/14 01:41:40)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/09/14 02:06:35)
Message:

Merge commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a'

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

(No files)

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