Changeset 049161fb in ffmpeg

Timestamp:
Jun 10, 2015, 6:19:19 PM (9 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
88679aeb
Parents:
de3a7ef2 (diff), 529c056 (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/10/15 18:18:08)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/10/15 18:19:19)
Message:

Merge commit '529c05698e88b057f0bea61e0d85f2b42925b5ea'

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

(No files)

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