Changeset c7b454f in ffmpeg

Timestamp:
Jan 21, 2014, 2:29:05 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
5b93b272
Parents:
ee3e1951 (diff), faf03ecb (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:27:51)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (01/21/14 14:29:05)
Message:

Merge commit 'faf03ecba03155bb1f5416713bd01da043863b43'

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

(No files)

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