Changeset 1cca1248 in ffmpeg

Timestamp:
Feb 11, 2015, 12:32:30 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
702cf8d0
Parents:
26db9d3b (diff), 0232ba62 (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/11/15 00:31:52)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/11/15 00:32:30)
Message:

Merge commit '0232ba62a28527579e34d44700b48017cc727e5f'

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

(No files)

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