Changeset 1b2a5817 in ffmpeg

Timestamp:
Aug 8, 2013, 8:49:23 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
5f38317
Parents:
eb02f0c6 (diff), 22c87905 (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> (08/08/13 08:48:36)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (08/08/13 08:49:23)
Message:

Merge commit '22c879057ead189c0f59241cb9eeb926381e3299'

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

(No files)

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