Merge commit '58d7b835e3cec48ab5a2393405fe82dee72c06a0' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 12:14:06 +0000 (14:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 12:14:06 +0000 (14:14 +0200)
commit6e83c266201adb15971bc3ad5c6c41fedace08ac
tree32bbcdf299d6970892b34f63bd8c72d763adc5fd
parenta4de70df20f094c23d6e3a6cbf6ca85c096b0e03
parent58d7b835e3cec48ab5a2393405fe82dee72c06a0
Merge commit '58d7b835e3cec48ab5a2393405fe82dee72c06a0' into release/1.1

* commit '58d7b835e3cec48ab5a2393405fe82dee72c06a0':
  fate: Add dependencies for dct/fft/mdct/rdft tests

Conflicts:
libavcodec/fft-test.c

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