Michael Niedermayer 6a7980e2cd Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  dct/fft: Give consistent names to fixed/float template files

Conflicts:
	libavcodec/fft_fixed.c
	libavcodec/fft_float.c
	libavcodec/mdct_fixed.c
	libavcodec/mdct_float.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-11-21 19:26:01 +01:00

814 B

Raw Blame History

View Raw