Changeset cbf190f7 in ffmpeg

Timestamp:
Mar 14, 2014, 12:56:45 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
c4979763
Parents:
3141b04c (diff), 80173c71 (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/14/14 00:56:40)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/14/14 00:56:45)
Message:

Merge commit '80173c71bab3b8817c148837bdc920557018f428'

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

(No files)

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