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)
* qatar/master:
  fft-test: add a missing #include

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

Simple merge