Changeset 1c4110be in ffmpeg

Timestamp:
May 3, 2014, 9:36:54 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
bc4b424d
Parents:
03963063 (diff), 3a177a9c (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> (05/03/14 21:36:01)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/03/14 21:36:54)
Message:

Merge commit '3a177a9cca924e097265b32f9282814f6b653e08'

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

(No files)

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