Changeset 06fe29c4 in ffmpeg

Timestamp:
Mar 1, 2014, 1:44:58 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
5972bcfa
Parents:
7fa3ec8 (diff), ea7f79f9 (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> (03/01/14 13:39:39)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/01/14 13:44:58)
Message:

Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6'

See: 582f36ca3fb1c69dbe3478f174d36278f5dd3f63
See: 69ce34c796dd2d595f3312848cf6d0c87506e0d0
Merged-by: Michael Niedermayer <michaelni@gmx.at>

(No files)

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