Changeset 1287b640 in ffmpeg

Timestamp:
Feb 23, 2014, 9:18:09 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
96ea3dea
Parents:
a2e4b23b (diff), 8eeacf31 (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> (02/23/14 21:17:19)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/23/14 21:18:09)
Message:

Merge commit '8eeacf31c5ea37baf6b222dc38d20cf4fd33c455'

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

(No files)

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