Merge commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 22:29:06 +0000 (00:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 22:29:06 +0000 (00:29 +0200)
commit9515d7c629cdd71c68bced05ea235aad08b768ce
treec4e55aa824ab522a74ff7036bace4b7648e70fa1
parent9eeedf87699837cd18df567a8d9d148009737b04
parent5be7d8597d02bcaba2de2503c0e59cf865c746dc
Merge commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc'

* commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc':
  fft-test: Comment some #endifs

Conflicts:
libavcodec/fft-test.c

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