Changeset a7630e37 in ffmpeg

Timestamp:
Oct 5, 2013, 8:50:47 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
5de251a3
Parents:
a927276f (diff), b698542a (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> (10/05/13 08:44:58)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/05/13 08:50:47)
Message:

Merge commit 'b698542ad83284fbb8c22404e3cafeb2dd739d38'

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

(No files)

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