Changeset d899ea20 in ffmpeg

Timestamp:
Nov 23, 2014, 12:16:32 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
6d8dda1
Parents:
293fee4b (diff), 4b68edd0 (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> (11/23/14 00:15:26)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/23/14 00:16:32)
Message:

Merge commit '4b68edd08ac352e314ae3fc701f90b081e549324'

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

(No files)

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