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