Changeset 5a7a56d7 in ffmpeg

Timestamp:
Nov 1, 2013, 6:33:16 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
04894ef3
Parents:
81c3bb78 (diff), b264453d (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> (11/01/13 18:33:03)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/01/13 18:33:16)
Message:

Merge commit 'b264453de93999ea6f23e98014390af468f56146'

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

(No files)

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