Changeset bf0470a in ffmpeg

Timestamp:
Jan 15, 2014, 2:27:26 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
92d07ea4
Parents:
28207bfa (diff), 36e3b1f2 (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/15/14 14:27:07)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (01/15/14 14:27:26)
Message:

Merge commit '36e3b1f2fd262028834a9d7b1eb533c1218ee6c2'

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

(No files)

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