Changeset dcb10ef9 in ffmpeg

Timestamp:
Nov 15, 2014, 6:23:05 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
aea7616
Parents:
89e705cd (diff), 2fa6d211 (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/15/14 18:22:30)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/15/14 18:23:05)
Message:

Merge commit '2fa6d21124bd2fc0b186290f5313179263bfcfb7'

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

(No files)

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