Merge commit '6133d658'

* commit '6133d658': fft-test: K&R formatting cosmetics Conflicts: libavcodec/fft-test.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '6133d658'
* commit '6133d658': fft-test: K&R formatting cosmetics Conflicts: libavcodec/fft-test.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
02ea384a · Michael Niedermayer · 629e5e28 · 6133d658 · 02ea384a
Commit 02ea384a authored Jul 23, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 85 additions and 80 deletions

fft-test.c libavcodec/fft-test.c +85 -80

No files found.
--- a/libavcodec/fft-test.c
+++ b/libavcodec/fft-test.c