Changeset ee3e1951 in ffmpeg

Timestamp:
Jan 21, 2014, 2:26:14 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
c7b454f
Parents:
29ba1cff (diff), a246d06f (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> (01/21/14 14:25:37)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (01/21/14 14:26:14)
Message:

Merge commit 'a246d06fe0dc6c2ea65e95327624b4537ff9bd0d'

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

(No files)

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