Changeset fd04082a in ffmpeg

Timestamp:
Jun 12, 2015, 9:04:30 PM (9 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
2cbadf51
Parents:
00ebf89d (diff), 2d5176fa (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/12/15 21:03:12)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/12/15 21:04:30)
Message:

Merge commit '2d5176fad1a4556d209cbfb0f681712c7eada4fd'

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

(No files)

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