Changeset f4c28aea in ffmpeg

Timestamp:
Nov 30, 2013, 2:40:09 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
47e5eaf8
Parents:
0cea39fd (diff), 8cebc9ea (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/30/13 02:39:56)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/30/13 02:40:09)
Message:

Merge commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07'

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

(No files)

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