Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Oct 2013 19:59:00 +0000 (21:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Oct 2013 19:59:24 +0000 (21:59 +0200)
commitc78a4169855861a8ac36192f15c456a357a526d6
tree68fd2804f23b0a794720774d15ca0a5ac3226a63
parent3fcc2684e49bbaa5a92a768f7649584e1d982f9f
parent834259528b6cf593bf9544e3183b84b9b7880641
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fft-test: add a missing #include

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