Changeset 10a28e8 in ffmpeg

Timestamp:
Apr 24, 2015, 6:37:51 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
036162a3
Parents:
97f074f1 (diff), b90adb0a (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> (04/24/15 18:37:47)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/24/15 18:37:51)
Message:

Merge commit 'b90adb0aba073f9c1b4abca852119947393ced4c'

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

(No files)

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