Changeset 0de64082 in ffmpeg

Timestamp:
Nov 6, 2014, 1:32:43 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
e591608
Parents:
cffd2713 (diff), 05e59135 (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/06/14 13:23:53)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/06/14 13:32:43)
Message:

Merge commit '05e59135b3539062465b5005b6d46ec0418a5fc4'

Not merged, this change is not correct

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

(No files)

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