Changeset 5a636383 in ffmpeg

Timestamp:
Jun 27, 2014, 12:36:45 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
09a7a470
Parents:
357168bc (diff), 24f45c16 (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.
Message:

Merge commit '24f45c16224d4c5d482e928676714766ffdda4fc'

Conflicts:

libavcodec/fft-test.c
tests/fate/fft.mak

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

(No files)

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