Merge commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jul 2014 18:40:41 +0000 (20:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jul 2014 18:40:41 +0000 (20:40 +0200)
commit09f5b3750f2d8164497ff4bdca74d01c9b25a361
tree4a09e4a840a96eaf2f5330ca26caced3d0442773
parent97d2b8d6f5a4b75ad80a265c30604870ebb97470
parentd445c865f87e7f13230e4dac3f77f5af21da95cb
Merge commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb'

* commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb':
  fft-test: Reduce variable scope where sensibly possible

Conflicts:
libavcodec/fft-test.c

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