Changeset 26f4a509 in ffmpeg

Timestamp:
Mar 14, 2014, 1:04:56 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
be60e204
Parents:
866e11b (diff), a7cc4ac9 (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> (03/14/14 01:04:54)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/14/14 01:04:56)
Message:

Merge commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730'

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

(No files)

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