Changeset c1488fab in ffmpeg

Timestamp:
Oct 8, 2013, 8:27:30 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
3d5a995e
Parents:
ba9c557b (diff), 25cb0c1a (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> (10/08/13 08:27:20)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/08/13 08:27:30)
Message:

Merge commit '25cb0c1a1e66edacc1667acf6818f524c0997f10'

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

(No files)

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