Changeset a6738791 in ffmpeg

Timestamp:
Dec 16, 2013, 10:57:29 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
196f7da
Parents:
a7889492 (diff), 11bb5e10 (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> (12/16/13 22:57:23)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/16/13 22:57:29)
Message:

Merge commit '11bb5e10c36539bcc303ceaac6f88d9ecb66e07f'

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

(No files)

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