Merge commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 18:35:23 +0000 (20:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 18:35:23 +0000 (20:35 +0200)
commit3ef8b4322cba2ebf9fd6b1c15d068ee90e9f9f96
treecd02323983a8c39384ea05a4113afd86dca8031d
parent9dc112e277fd67e05044b34ce9fb3177905f2db5
parentd396987c303bdc4eea7d1a1ff6776475d9bbd9ea
Merge commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea' into release/2.2

* commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea':
  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