Changeset 01983e5 in ffmpeg

Timestamp:
Jun 28, 2014, 7:31:18 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
4d3072ad
Parents:
e6aba1be (diff), 7b0c7c91 (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> (06/28/14 19:31:14)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/28/14 19:31:18)
Message:

Merge commit '7b0c7c9163fe3dd0081696befde28617119d2590'

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

(No files)

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