Changeset da9a6f4a in ffmpeg

Timestamp:
May 31, 2015, 9:42:36 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
1046b6b0
Parents:
1aff9050 (diff), eecd29b (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/31/15 21:23:58)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/31/15 21:42:36)
Message:

Merge commit 'eecd29b3fd7fee221580798346d6582b75c7ade4'

Conflicts:

libavutil/ppc/float_dsp_init.c

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

(No files)

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