RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
62,262 Commits 36 Branches 392 Tags 310 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
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
Diego Biurrun ac0e03bab0 dct/fft: Give consistent names to fixed/float template files 2013-11-21 15:59:46 +01:00