Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2013-11-21 | 1 | -4/+4 |
| | | | | | | | | | | | | | * 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> | ||||
* | dct/fft: Give consistent names to fixed/float template files | Diego Biurrun | 2013-11-21 | 1 | -0/+276 |