Merge commit '24f45c16224d4c5d482e928676714766ffdda4fc'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Jun 2014 00:36:45 +0000 (02:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Jun 2014 00:36:45 +0000 (02:36 +0200)
commit5a636383db9b199932576c3767cb44c958bc11db
treea1912b71b60dd44787a8638f08fccfd944e9c50a
parent357168bcf63429e9472fb9fff1e1301f9514dca6
parent24f45c16224d4c5d482e928676714766ffdda4fc
Merge commit '24f45c16224d4c5d482e928676714766ffdda4fc'

* commit '24f45c16224d4c5d482e928676714766ffdda4fc':
  fate: Add dependencies for dct/fft/mdct/rdft tests

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/fft-test.c
tests/fate/fft.mak